foreman_fog_proxmox 0.12.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24ea33cf00db1fc077b47811dba321202308f03801612dab34a93613fa31d34a
-  data.tar.gz: f579acd4f75749a0676afdbb8f106ede3dcbedaca41e63297c7f36a222e31ccc
+  metadata.gz: f47c6b4425f06c4b7b7547bf71e3e985c66d660bdb54328370a6c196135c9791
+  data.tar.gz: 902aa40b81589de604ae8cf3670c1af7762e8700b11eb3065b649c38ae6b2e36
 SHA512:
-  metadata.gz: b7252797a07aff96816601a9ce46adb13e242098e4a9731ccf29f515537d6c41d7f70f0c93fb0463eb54d8d0d5beb22f9acd4e4eca8817513d742097ffbcf7bf
-  data.tar.gz: 9f03bf388ae9af712be16fa65424cb8c789abd8d4c6282d59215fa4248d94f96effeb0e84c3051da793e867ff42831df2d566dd3e5d5725e82bb7c741fadaca9
+  metadata.gz: 3fe6bd7f8ba0c72d7bf04348d7463dd5611465b77fbd6de93258d10433e4736eb20f89b97cf9f2842069fd69e0ec5928124b5598cdbcd72aefa0dfa9b1c80bcb
+  data.tar.gz: 9d341aa011e5b5a3f1738e05ff72d02c0caa97149c57fa1918506c8051524304ccbe87a76ec6e07d26444a7f4fc2f2fdd8a0e2a119224fc58f13acaad6e32c94

data/README.md

@@ -32,6 +32,8 @@ You can support the plugin development via the following methods:
 |>=0.10 |>=5.4|>=0.9.4|>=1.22|>=2.5|
 |>=0.11 |>=5.4|>=0.10|>=1.22|>=2.5|
 |>=0.12 |>=6.1|>=0.11|>=2.0|>=2.5|
+|>=0.14 |>=6.2|=0.13.0|>=2.4|>=2.7|
+|>=0.14 |>=6.2|>=0.13.1|>=2.3|>=2.5|
 
 ## Installation
 
@@ -114,8 +116,8 @@ Redhat, CentOS or Fedora users should also [setup Selinux](https://projects.thef
 ### Prerequisites
 
 * You need a Proxmox VE 5.4+ server running.
-* You need ruby >= 2.5. You can install it with [rbenv](https://github.com/rbenv/rbenv).
-* You also need nodejs in your dev machine to run webpack-dev-server. You can install it with [nvm](https://github.com/creationix/nvm).
+* You need ruby >= 2.5. You can install it with [asdf-vm](https://asdf-vm.com).
+* You also need nodejs in your dev machine to run webpack-dev-server. You can install it with [asdf-vm](https://asdf-vm.com).
 
 ### Platform
 
@@ -135,6 +137,7 @@ gem 'foreman_fog_proxmox', :path => '../../theforeman/foreman_fog_proxmox'
 gem 'fog-proxmox', :path => '../../fog/fog-proxmox' # optional if you need to modify fog-proxmox code too
 gem 'ruby-debug-ide' # dev
 gem 'debase' # dev
+gem 'solargraph' # dev
 gem 'simplecov' # test
 ```
 
@@ -142,8 +145,9 @@ gem 'simplecov' # test
 
 ```shell
 gem install bundler
-# prerequisites postgresql-client library on OS
+# prerequisites postgresql-XX-client library on OS (XX=major release installed in OS)
 bundle config set without 'libvirt ovirt mysql2'
+bundle config build.pg --with-pg-config=/usr/pgsql-XX/bin/pg_config
 bundle install
 ```
 
@@ -176,7 +180,7 @@ cp config/model.mappings.example config/model.mappings
 cp config/database.yml.example config/database.yml
 ```
 
-add these lines to config/database.yml:
+add these lines to each environment in config/database.yml:
 
 ```yaml
     username: foreman
@@ -187,6 +191,7 @@ add these lines to config/database.yml:
 cp config/ignored_environments.yml.sample config/ignored_environments.yml
 docker run --name foreman-db -e POSTGRES_DB=foreman -e POSTGRES_USER=foreman -e POSTGRES_PASSWORD=foreman -p 5432:5432 -d postgres
 bundle exec bin/rake db:migrate
+# reboot if settings.NAME error in schema
 bundle exec bin/rake db:seed assets:precompile locale:pack webpack:compile
 ```
 
@@ -205,7 +210,15 @@ docker exec -it foreman-db psql -U foreman
 foreman=# create database "foreman-test";
 ```
 
-all:
+then add test schema and seeds:
+
+```shell
+RAILS_ENV=test bundle exec bin/rake db:migrate
+# reboot if error: "ActiveRecord::RecordNotFound: Couldn't find Setting with [WHERE "settings"."name" = $1]"
+RAILS_ENV=test bundle exec bin/rake db:seed
+```
+
+Finally you can test all:
 
 ```shell
 export DISABLE_SPRING=true
@@ -216,7 +229,7 @@ or just one:
 
 ```shell
 export DISABLE_SPRING=true
-bundle exec bin/rake test TEST=test/functional/compute_resources_controller_test.rb DATABASE_URL=nulldb://nohost
+bundle exec bin/rake test TEST=../foreman_fog_proxmox/test/functional/compute_resources_controller_test.rb DATABASE_URL=nulldb://nohost
 ```
 
 * Check code syntax with rubocop and foreman rules:
@@ -273,6 +286,12 @@ bundle exec bin/rails server
 bundle exec foreman start
 ```
 
+If you want to delete vm on host destroy, add this line in config/settings.yml:
+
+```yml
+:destroy_vm_on_host_delete: false
+```
+
 See details in [foreman plugin development](https://projects.theforeman.org/projects/foreman/wiki/How_to_Create_a_Plugin)
 
 ## Contributing

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_compute_resource.js

@@ -16,9 +16,13 @@
 // along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 $(document).on('ContentLoad', tfm.numFields.initAll);
-$(document).ready(sslVerifyPeerSelected);
 
-function sslVerifyPeerSelected(){
+$(document).ready(function () {
+  sslVerifyPeerSelected();
+  authMethodSelected();
+});
+
+function sslVerifyPeerSelected() {
   var selected = $("#compute_resource_ssl_verify_peer").is(':checked');
   var ssl_certs_block = $('#compute_resource_ssl_certs').parents('.clearfix');
   var ssl_certs_textarea = $('#compute_resource_ssl_certs');
@@ -31,3 +35,33 @@ function sslVerifyPeerSelected(){
     ssl_certs_textarea.hide();
   }
 }
+
+function enableField(item) {
+  $(item).show();
+  $(item).removeAttr('disabled');
+}
+
+function disableField(item) {  
+  $(item).hide();
+  $(item).attr('disabled','disabled');
+}
+
+function toggleFieldset(method, selected){
+  return method === selected ? enableField(authMethodFieldsetId(method)) : disableField(authMethodFieldsetId(method));
+}
+
+function authMethods(){
+  return ['user_token', 'access_ticket'];
+}
+
+function authMethodFieldsetId(method){
+  return '#compute_ressource_' + method + '_field_set';
+}
+
+function authMethodSelected() {
+  var selected = $("#compute_resource_auth_method").val();
+  console.log("auth_method="+selected);
+  authMethods().forEach(function(method){
+    toggleFieldset(method, selected);
+  });
+}

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_vm.js

@@ -34,67 +34,139 @@ function vmTypeSelected() {
   fieldsets.push({id: 'config_cdrom', toggle: false, new_vm: new_vm, selected: selected});
   fieldsets.push({id: 'config_os', toggle: false, new_vm: new_vm, selected: selected});
   fieldsets.push({id: 'config_dns', toggle: false, new_vm: new_vm, selected: selected});
-  fieldsets.forEach(toggleFieldset);
+  fieldsets.forEach(toggleFieldsets);
   toggleVolumes(selected);
   return false;
 }
 
+function volumeButtonAddId(item){
+  return $("a[data-association='" + item + "_volumes']");
+}
+
+function volumeFieldsetId(item, type){
+  return $("fieldset[id^='" + type + "_volume_"+ item +"']").not("fieldset[id$='_new_" + item +"_volumes']");
+}
+
+function indexByIdAndType(item, storage_type, vm_type){
+  let regex = new RegExp(`${vm_type}_volume_${storage_type}_(\\d+)`);
+  return item.match(regex)[1];
+}
+
+function volidByIndexAndTag(index, tag){
+  return $(tag + "[id='host_compute_attributes_volumes_attributes_" + index + "_volid']").val();
+}
+
+function hasCloudinit(){
+  result = false;
+  let volume_id = volumeFieldsetId('cloud_init', 'server').attr('id');
+  if (volume_id !== undefined){
+    let index = indexByIdAndType(volume_id, 'cloud_init', 'server');
+    let volid = volidByIndexAndTag(index, 'input');
+    result = volid.includes("cloudinit");
+  }
+  return result;
+}
+
+function hasCdrom(){
+  result = false;
+  let volume_id = volumeFieldsetId('cdrom', 'server').attr('id');
+  if (volume_id !== undefined){
+    let index = indexByIdAndType(volume_id, 'cdrom', 'server');
+    let checked = $("input[id^='host_compute_attributes_volumes_attributes_" + index + "_cdrom']:checked").val();
+    let isCdrom = checked === 'cdrom';
+    result = isCdrom;
+    let isImage = checked === 'image';
+    if (isImage) {
+      let volid = volidByIndexAndTag(index, 'select');
+      result = volid.includes("iso");
+    }
+  }
+  return result;
+}
+
+function cloudinit(item){
+  return item === 'cloud_init' && hasCloudinit();
+}
+
+function cdrom(item){
+  return item === 'cdrom' && hasCdrom();
+}
+
+function enableVolume(volume_id, type){
+  volumeFieldsetId(volume_id, type).show();
+  volumeButtonAddId(volume_id).show();
+  if (cloudinit(volume_id) || cdrom(volume_id)){
+    volumeButtonAddId(volume_id).hide();
+  }
+  volumeFieldsetId(volume_id, type).removeAttr('disabled');
+}
+
+function disableVolume(volume_id, type){
+  volumeFieldsetId(volume_id, type).hide();
+  volumeButtonAddId(volume_id).hide();
+  volumeFieldsetId(volume_id, type).attr('disabled','disabled');
+}
+
+function volumes(type){
+  return type === 'qemu' ? ['hard_disk', 'cdrom', 'cloud_init'] : ['mp', 'rootfs'];
+}
+
+function volume(type){
+  return type === 'qemu' ? 'server' : 'container';
+}
+
+function toggleVolume(volume_id, type1, type2){
+  type1 === type2 ? enableVolume(volume_id, volume(type1)) : disableVolume(volume_id, volume(type1));
+}
+
 function toggleVolumes(selected){
-  var div_container = $("div[id^='container_volumes']");
-  var div_server = $("div[id^='server_volumes']");
-  var a_container = $("a[data-association='container_volumes']");
-  var a_server = $("a[data-association='server_volumes']");
-  switch (selected) {
-    case 'qemu':
-      div_container.hide();
-      div_server.show();
-      a_container.hide();
-      a_server.show();
-      break;
-    case 'lxc':
-      div_container.show();
-      div_server.hide();
-      a_container.show();
-      a_server.hide();
-      break;
-    default:
-      console.log("unkown type="+selected);
-      break;
+   ['qemu', 'lxc'].forEach(function(type){
+    volumes(type).forEach(function(volume_id){
+      toggleVolume(volume_id, selected, type);
+    });
+  });
+}
+
+function enableFieldset(fieldsetId, fieldset) {
+  if (fieldset.toggle && fieldset.new_vm){
+    fieldset_id(fieldsetId, fieldset).show();
   }
+  fieldset_id(fieldsetId, fieldset).removeAttr('disabled');
+  input_hidden_id(fieldsetId).removeAttr('disabled');
 }
 
-function toggleFieldset(fieldset, index, fieldsets){
-  var server_input_hidden = $("div[id^='server_volumes']" + " + input:hidden");
-  var container_input_hidden = $("div[id^='container_volumes']" + " + input:hidden");
-  var removable_input_hidden = $("div.removable-item[style='display: none;']" + " + input:hidden");
-  var server_fieldset = $("fieldset[id^='server_"+fieldset.id+"']");
-  var container_fieldset = $("fieldset[id^='container_"+fieldset.id+"']");
-  removable_input_hidden.attr('disabled','disabled');
-  switch (fieldset.selected) {
-    case 'qemu':
-      if (fieldset.toggle && fieldset.new_vm){
-        server_fieldset.show();
-        container_fieldset.hide();
-      }
-      server_fieldset.removeAttr('disabled');
-      container_fieldset.attr('disabled','disabled');
-      server_input_hidden.removeAttr('disabled');
-      container_input_hidden.attr('disabled','disabled');
-      break;
-    case 'lxc':
-      if (fieldset.toggle && fieldset.new_vm){
-        server_fieldset.hide();
-        container_fieldset.show();
-      }
-      server_fieldset.attr('disabled','disabled');
-      container_fieldset.removeAttr('disabled');
-      container_input_hidden.removeAttr('disabled');
-      server_input_hidden.attr('disabled','disabled');
-      break;
-    default:
-      console.log("unkown type="+fieldset.selected);
-      break;
+function disableFieldset(fieldsetId, fieldset) {  
+  if (fieldset.toggle && fieldset.new_vm){
+    fieldset_id(fieldsetId, fieldset).hide();
   }
+  fieldset_id(fieldsetId, fieldset).attr('disabled','disabled');
+  input_hidden_id(fieldsetId).attr('disabled','disabled');
+}
+
+function toggleFieldset(fieldsetId, fieldset, type1, type2) {  
+  type1 === type2 ? enableFieldset(fieldsetId, fieldset) : disableFieldset(fieldsetId, fieldset);
+}
+
+function input_hidden_id(volume_id){
+  return $("div[id^='"+ volume_id +"_volumes']" + " + input:hidden");
+}
+
+function fieldset_id(fieldsetId, fieldset){
+  return $("fieldset[id^='" + fieldsetId + "_"+fieldset.id+"']");
+}
+
+function fieldsets(type){
+  return type === 'qemu' ? ['server'] : ['container'];
+}
+
+function toggleFieldsets(fieldset){
+  var removable_input_hidden = $("div.removable-item[style='display: none;']" + " + input:hidden");
+  removable_input_hidden.attr('disabled','disabled');  
+  ['qemu', 'lxc'].forEach(function(type){
+    fieldsets(type).forEach(function(fieldsetId){
+      toggleFieldset(fieldsetId, fieldset, fieldset.selected, type);
+    });
+  });
 }
 
 function nodeSelected(item) {
@@ -118,18 +190,18 @@ function nodeSelected(item) {
   }
 }
 
-function emptySelect(select){
-  $(select).empty();
-  $(select).append($("<option></option>").val('').text(''));
-  $(select).val('');
+function emptySelect(select_id){
+  $(select_id).empty();
+  $(select_id).append($("<option></option>").val('').text(''));
+  $(select_id).val('');
 }
 
 function initOptions(select_ids){
   console.log('initOptions(' + select_ids[0] + ')');
   select_ids.forEach(emptySelect);
-  select_ids.forEach(function(select){
-    $(select + ' option:selected').prop('selected',false);
-    $(select).val('');
+  select_ids.forEach(function(select_id){
+    $(select_id + ' option:selected').prop('selected',false);
+    $(select_id).val('');
   });
 }
 
@@ -156,7 +228,9 @@ function updateOptions(options_path, start_options_id, end_options_id, start_sec
   if ( start_second_options_id != undefined && end_second_options_id != undefined) {
     select_second_ids = selectIds(start_second_options_id, end_second_options_id);
   }
-  var url = '/foreman_fog_proxmox/' + options_path +  '/' + node_id;
+  var compute_resource_id = $("#host_compute_resource_id").val();
+  if (compute_resource_id == undefined) compute_resource_id = $("#compute_attribute_compute_resource_id").val(); // profil
+  var url = '/foreman_fog_proxmox/' + options_path +  '/' + compute_resource_id +  '/' + node_id;
   if (second_id != undefined) url += '/' + second_id;
   tfm.tools.showSpinner();
   $.getJSON({

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_vm_server.js

@@ -15,51 +15,6 @@
 // You should have received a copy of the GNU General Public License
 // along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
-function cdromSelected(item) {
-  var selected = $(item).val();
-  var cdrom_image_form = $('#cdrom_image_form');
-
-  switch (selected) {
-    case 'none':
-      initCdromStorage();
-      initCdromOptions('iso');
-      cdrom_image_form.hide();
-      break;
-    case 'cdrom':
-      initCdromStorage();
-      initCdromOptions('iso');
-      cdrom_image_form.hide();
-      break;
-    case 'image':
-      initCdromStorage();
-      initCdromOptions('iso');
-      cdrom_image_form.show();
-      break;
-    default:
-      break;
-  }
-  return false;
-}
-
-function initCdromStorage() {
-  var select = '#host_compute_attributes_config_attributes_cdrom_storage';
-  $(select + ' option:selected').prop('selected', false);
-  $(select).val('');
-}
-
-function initCdromOptions(name) {
-  var select = '#host_compute_attributes_config_attributes_cdrom_' + name;
-  $(select).empty();
-  $(select).append($("<option></option>").val('').text(''));
-  $(select).val('');
-}
-
-function storageIsoSelected(item) {
-  var storage = $(item).val();
-  var node_id = $('#host_compute_attributes_node_id').val();
-  updateOptions('isos', 'compute_attributes_config_attributes', 'cdrom_iso', undefined, undefined, 'volid', node_id, storage);
-}
-
 function attributesPrefixSelector(profile, type) {
   return profile ?  '#compute_attribute_vm_attrs_' + type + '_attributes_': '#host_compute_attributes_' + type + '_attributes_';
 }
@@ -69,11 +24,10 @@ function volumesAttributesSelector(profile,index,selector) {
 }
 
 function getIndex(item) {
-  var id = $(item).attr('id');
+  var index_id = $(item).attr('id');
   var pattern = /(host_compute_attributes_volumes_attributes_||compute_attribute_vm_attrs_volumes_attributes_)(\d+)[_](.*)/i;
-  pattern_a = pattern.exec(id);
+  pattern_a = pattern.exec(index_id);
   var index = pattern_a[2];
-  console.log("index=" + index);
   return index;
 }
 
@@ -86,7 +40,6 @@ function controllerSelected(item) {
   var index = getIndex(item);
   var max = computeControllerMaxDevice(controller);
   var profile = isProfile();
-  console.log("profile="+profile);
   var device_selector = volumesAttributesSelector(profile,index,'device');
   var id_selector = volumesAttributesSelector(profile,index,'id');
   $(device_selector).attr('data-soft-max', max);
@@ -100,7 +53,6 @@ function deviceSelected(item) {
   var device = $(item).limitedSpinner('value');
   var index = getIndex(item);
   var profile = isProfile();
-  console.log("profile="+profile);
   var controller_selector = volumesAttributesSelector(profile,index,'controller');
   var id_selector = volumesAttributesSelector(profile,index,'id');
   var controller = $(controller_selector).val();