foreman_fog_proxmox 0.11.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6bb8fe5df4bb574ffc4870265793222d2704c7d43412e087493306b7b599cc3
-  data.tar.gz: 48a5e82861e06306ad0ab8614c86fdab34ddbf73eb97ca08705c7cc788974822
+  metadata.gz: 6101f16731ab275d2adfb1b0abc8fd25690688e34569b7f63c360fb6442da5ec
+  data.tar.gz: 62bfd05f02a526de1a4decc27d5a8c6ee5539b58316fb0bc29338dc26f4c0a04
 SHA512:
-  metadata.gz: e0b68b69c292fbc33284c18bd81e975d226eb82047ea7880a9ce97cf04ccbdddc9125c195ad75f60db923604f4c8ca480c45d5840c0eb41c9c5c9e1c1d60e985
-  data.tar.gz: aed1ca445f09e2fa6237641be539958d83e3537f9508169c23a0320e0f7365e587cc279fa231cb5a01d59ceeb7357bfa2f35678b144fed9b820a4c6d00b2b0c7
+  metadata.gz: d46aa0181a540105670a8b4cc988f791cde9ac05d8323c2eec250d53ee44c1b1eaea581619276f21cc7a433931470007019e2e3028ece8f750b4fcef704398ac
+  data.tar.gz: ce879270338d08b684991184079b8106519de9394c4e85b8cfcc74e5e30620a75d217eefa8ce8301711b30fbcd20ef051925a3190ae5b8b34e4c4157a1a3895c

data/README.md

@@ -32,6 +32,7 @@ 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|>=2.0|>=2.5|
 
 ## Installation
 
@@ -114,8 +115,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
 
@@ -141,6 +142,8 @@ gem 'simplecov' # test
 * In foreman directory, install dependencies:
 
 ```shell
+gem install bundler
+# prerequisites postgresql-client library on OS
 bundle config set without 'libvirt ovirt mysql2'
 bundle install
 ```
@@ -155,6 +158,12 @@ npm install
 cp config/settings.yaml.test config/settings.yaml
 ```
 
+add these lines to config/settings.yml:
+
+```yaml
+    :webpack_dev_server: true
+```
+
 * SQLite is no more default rails dev or test database, instead add:
 
 ```shell
@@ -208,7 +217,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:

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,21 @@ function sslVerifyPeerSelected(){
     ssl_certs_textarea.hide();
   }
 }
+
+function authMethodSelected() {
+  var selected = $("#compute_resource_auth_method").val();
+  console.log("auth_method="+selected);
+  var compute_ressource_user_token_field_set = $('#compute_ressource_user_token_field_set');
+  var compute_ressource_access_ticket_field_set = $('#compute_ressource_access_ticket_field_set');
+  if (selected == 'user_token') {
+    compute_ressource_user_token_field_set.show();
+    compute_ressource_user_token_field_set.removeAttr('disabled');
+    compute_ressource_access_ticket_field_set.hide();
+    compute_ressource_access_ticket_field_set.attr('disabled','disabled');
+  } else {
+    compute_ressource_access_ticket_field_set.show();
+    compute_ressource_access_ticket_field_set.removeAttr('disabled');
+    compute_ressource_user_token_field_set.hide();
+    compute_ressource_user_token_field_set.attr('disabled','disabled');
+  }
+}

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(id){
+  return $("a[data-association='" + id + "_volumes']");
+}
+
+function volumeFieldsetId(id, type){
+  return $("fieldset[id^='" + type + "_volume_"+ id +"']").not("fieldset[id$='_new_" + id +"_volumes']");
+}
+
+function indexByIdAndType(id, storage_type, vm_type){
+  let regex = new RegExp(`${vm_type}_volume_${storage_type}_(\\d+)`);
+  return id.match(regex)[1];
+}
+
+function volidByIndexAndTag(index, tag){
+  return $(tag + "[id='host_compute_attributes_volumes_attributes_" + index + "_volid']").val();
+}
+
+function hasCloudinit(){
+  result = false;
+  let id = volumeFieldsetId('cloud_init', 'server').attr('id');
+  if (id !== undefined){
+    let index = indexByIdAndType(id, 'cloud_init', 'server');
+    let volid = volidByIndexAndTag(index, 'input');
+    result = volid.includes("cloudinit");
+  }
+  return result;
+}
+
+function hasCdrom(){
+  result = false;
+  let id = volumeFieldsetId('cdrom', 'server').attr('id');
+  if (id !== undefined){
+    let index = indexByIdAndType(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(id){
+  return id === 'cloud_init' && hasCloudinit();
+}
+
+function cdrom(id){
+  return id === 'cdrom' && hasCdrom();
+}
+
+function enableVolume(id, type){
+  volumeFieldsetId(id, type).show();
+  volumeButtonAddId(id).show();
+  if (cloudinit(id) || cdrom(id)){
+    volumeButtonAddId(id).hide();
+  }
+  volumeFieldsetId(id, type).removeAttr('disabled');
+}
+
+function disableVolume(id, type){
+  volumeFieldsetId(id, type).hide();
+  volumeButtonAddId(id).hide();
+  volumeFieldsetId(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(id, type1, type2){
+  type1 === type2 ? enableVolume(id, volume(type1)) : disableVolume(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(id){
+      toggleVolume(id, selected, type);
+    });
+  });
+}
+
+function enableFieldset(id, fieldset) {
+  if (fieldset.toggle && fieldset.new_vm){
+    fieldset_id(id, fieldset).show();
   }
+  fieldset_id(id, fieldset).removeAttr('disabled');
+  input_hidden_id(id).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(id, fieldset) {  
+  if (fieldset.toggle && fieldset.new_vm){
+    fieldset_id(id, fieldset).hide();
   }
+  fieldset_id(id, fieldset).attr('disabled','disabled');
+  input_hidden_id(id).attr('disabled','disabled');
+}
+
+function toggleFieldset(id, fieldset, type1, type2) {  
+  type1 === type2 ? enableFieldset(id, fieldset) : disableFieldset(id, fieldset);
+}
+
+function input_hidden_id(id){
+  return $("div[id^='"+ id +"_volumes']" + " + input:hidden");
+}
+
+function fieldset_id(id, fieldset){
+  return $("fieldset[id^='" + id + "_"+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(id){
+      toggleFieldset(id, fieldset, fieldset.selected, type);
+    });
+  });
 }
 
 function nodeSelected(item) {

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_';
 }
@@ -73,7 +28,6 @@ function getIndex(item) {
   var pattern = /(host_compute_attributes_volumes_attributes_||compute_attribute_vm_attrs_volumes_attributes_)(\d+)[_](.*)/i;
   pattern_a = pattern.exec(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();

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

@@ -0,0 +1,39 @@
+// Copyright 2018 Tristan Robert
+
+// This file is part of ForemanFogProxmox.
+
+// ForemanFogProxmox is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// ForemanFogProxmox is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+function getIndex(item) {
+  var id = $(item).attr('id');
+  var pattern = /(host_compute_attributes_volumes_attributes_||compute_attribute_vm_attrs_volumes_attributes_)(\d+)[_](.*)/i;
+  pattern_a = pattern.exec(id);
+  var index = pattern_a[2];
+  return index;
+}
+
+function volumeId(type,index){
+  let id = '#volume_' + type + '_' + index;
+  return id;
+}
+
+function enableField(id) {
+  $(id).show();
+  $(id).removeAttr('disabled');
+}
+
+function disableField(id) {  
+  $(id).hide();
+  $(id).attr('disabled','disabled');
+}

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

@@ -0,0 +1,63 @@
+// Copyright 2018 Tristan Robert
+
+// This file is part of ForemanFogProxmox.
+
+// ForemanFogProxmox is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// ForemanFogProxmox is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// 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 index = getIndex(item);
+  var cdrom_image_form_id = '#cdrom_image_form_' + index;
+
+  switch (selected) {
+    case 'none':
+      initCdromStorage(index);
+      initCdromOptions(index,'volid');
+      disableField(cdrom_image_form_id);
+      break;
+    case 'cdrom':
+      initCdromStorage(index);
+      initCdromOptions(index,'volid');
+      disableField(cdrom_image_form_id);
+      break;
+    case 'image':
+      initCdromStorage(index);
+      initCdromOptions(index,'volid');
+      enableField(cdrom_image_form_id);
+      break;
+    default:
+      break;
+  }
+  return false;
+}
+
+function initCdromStorage(index) {
+  var select = '#host_compute_attributes_volumes_attributes_' + index + '_storage';
+  $(select + ' option:selected').prop('selected', false);
+  $(select).val('');
+}
+
+function initCdromOptions(index, name) {
+  var select = '#host_compute_attributes_volumes_attributes_' + index + '_' + name;
+  $(select).empty();
+  $(select).append($("<option></option>").val('').text(''));
+  $(select).val('');
+}
+
+function storageIsoSelected(item) {
+  var index = getIndex(item);
+  var storage = $(item).val();
+  var node_id = $('#host_compute_attributes_node_id').val();
+  updateOptions('isos', 'compute_attributes_volumes_attributes_' + index , 'volid', undefined, undefined, 'volid', node_id, storage);
+}