foreman_fog_proxmox 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67b90e9d6ff96226f14cddbef179252562e82abbdb1796e0c13d5f69cfc8a3c6
-  data.tar.gz: c845f7e54a242b0aa0615c799e49632ee6eb65a611238deec9d1647ba938d311
+  metadata.gz: 481cace7d30a49fb40a61fe50041ff10a278d674fd0420eca29c6bb756dfff9d
+  data.tar.gz: ff60cb1dd7b8793c19146431ed0c41b7f15a9e7a2379474f7b6ef80f6c8ee213
 SHA512:
-  metadata.gz: 4e8cda3b7436b46cd4f64ff2d676b810943ce382d53fd6da58bfdaf3faabe310b429c1fb076bed47ee10b00386d505d4531190361e1b7bf943863f45794072de
-  data.tar.gz: 01a69e1955953ac427add329d4883f5b8bde2df97aae11db1972d746d9f93dd0d8a010f107cf80f804265a595ea0aa2c130a407b091546e8fe21070e27e852d1
+  metadata.gz: e6eb265bcc6d768b55d10df5987bd3fa003960f7adbb54072d54edb46a84e5f5bb51b16565665f497ef2848ae996a80f58132ebe8c2be8370ce044cb945a9ff6
+  data.tar.gz: ccc4f415b32b1ef39a628a2d30048464612c35707c5be757248e0e69dddf2c314f5dbbf066c0f219506a164e61610935af7794f76bdf26864f4897e42b7ac139

data/README.md

@@ -10,7 +10,7 @@
 
 It is intended to satisfy this [feature](http://projects.theforeman.org/issues/2186).
 
-If you like it and need more features you can [support](SUPPORT.md) it.
+If you like it and need more features you can [support](.github/SUPPORT.md) it.
 
 ## Compatibility versions
 
@@ -18,7 +18,7 @@ If you like it and need more features you can [support](SUPPORT.md) it.
 |--|--|--|--|--|
 |<0.6|<5.3|<0.6|<=1.20|>=2.3|
 |=0.6|=5.3|=0.6|=1.21|>=2.3|
-|=0.7|=5.4|=0.7|=1.22|>=2.3|
+|>=0.7|=5.4|>=0.7|>=1.22|>=2.3|
 
 ## Installation
 
@@ -142,6 +142,7 @@ cp config/settings.yaml.test config/settings.yaml
 ```shell
 cp config/model.mappings.example config/model.mappings
 cp config/database.yml.example config/database.yml
+cp config/ignored_environments.yml.sample config/ignored_environments.yml
 bundle exec bin/rake db:migrate
 bundle exec bin/rake db:seed
 ```
@@ -202,10 +203,10 @@ See details in [foreman plugin development](https://projects.theforeman.org/proj
 
 ## Contributing
 
-You can reach the [contributors](CONTRIBUTORS.md).
+You can reach the [contributors](.github/CONTRIBUTORS.md).
 Bug reports and pull requests are welcome on GitHub at [ForemanFogProxmox](https://github.com/theforeman/foreman_fog_proxmox).
 
-Please read more information about [how to contribute](CONTRIBUTING.md).
+Please read more information about [how to contribute](.github/CONTRIBUTING.md).
 
 ## License
 

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

@@ -15,12 +15,19 @@
 // You should have received a copy of the GNU General Public License
 // along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
-function sslVerifyPeerSelected(item){
-  var selected = $(item).is(':checked');
-  var ssl_certs_form = $('#compute_resource_ssl_certs').parents('.clearfix');
+$(document).on('ContentLoad', tfm.numFields.initAll);
+$(document).ready(sslVerifyPeerSelected);
+
+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');
   if (selected) {
-    ssl_certs_form.show();
+    ssl_certs_block.show();
+    ssl_certs_textarea.show();
   } else {
-    ssl_certs_form.hide();
+    ssl_certs_block.hide();
+    ssl_certs_textarea.text('');
+    ssl_certs_textarea.hide();
   }
 }

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

@@ -79,36 +79,55 @@ function storageIsoSelected(item) {
   }
 }
 
+function attributesPrefixSelector(profile, type) {
+  return profile ?  '#compute_attribute_vm_attrs_' + type + '_attributes_': '#host_compute_attributes_' + type + '_attributes_';
+}
+
+function volumesAttributesSelector(profile,index,selector) {
+  return attributesPrefixSelector(profile,'volumes') + index + '_' + selector;
+}
+
+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];
+  console.log("index=" + index);
+  return index;
+}
+
+function isProfile() {
+  return $(volumesAttributesSelector(true,0,'id')) !== undefined;
+}
+
 function controllerSelected(item) {
   var controller = $(item).val();
   var index = getIndex(item);
   var max = computeControllerMaxDevice(controller);
-  var device_selector = '#host_compute_attributes_volumes_attributes_' + index + '_device';
+  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);
   var device = $(device_selector).limitedSpinner('value');
-  $('#host_compute_attributes_volumes_attributes_' + index + '_id').val(controller + device);
+  var id = controller + device;
+  $(id_selector).val(id);
   tfm.numFields.initAll();
 }
 
 function deviceSelected(item) {
   var device = $(item).limitedSpinner('value');
-  console.log("device=" + device);
   var index = getIndex(item);
-  var controller_selector = '#host_compute_attributes_volumes_attributes_' + index + '_controller';
+  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();
-  $('#host_compute_attributes_volumes_attributes_' + index + '_id').val(controller + device);
+  var id = controller + device;
+  $(id_selector).val(id);
   tfm.numFields.initAll();
 }
 
-function getIndex(item) {
-  var id = $(item).attr('id');
-  var pattern = /(host_compute_attributes_volumes_attributes_)(\d+)[_](.*)/i;
-  pattern_a = pattern.exec(id);
-  var index = pattern_a[2];
-  console.log("index=" + index);
-  return index;
-}
-
 function computeControllerMaxDevice(controller) {
   switch (controller) {
     case 'ide':

data/app/helpers/proxmox_container_helper.rb

@@ -45,7 +45,7 @@ module ProxmoxContainerHelper
     memory_a = %w[memory swap]
     memory = parse_container_memory(config.select { |key,_value| memory_a.include? key })
     interfaces_attributes = args['interfaces_attributes']
-    networks = parse_container_interfaces(interfaces_attributes)
+    interfaces_to_add, interfaces_to_delete = parse_container_interfaces(interfaces_attributes)
     general_a = %w[node_id name type config_attributes volumes_attributes interfaces_attributes firmware_type provision_method container_volumes server_volumes]
     logger.debug("general_a: #{general_a}")
     parsed_vm = args.reject { |key,value| general_a.include?(key) || ostemplate_a.include?(key) || ForemanFogProxmox::Value.empty?(value) }
@@ -57,7 +57,8 @@ module ProxmoxContainerHelper
     parsed_config = config.reject { |key,value| config_a.include?(key) || ForemanFogProxmox::Value.empty?(value) }
     logger.debug("parse_container_config(): #{parsed_config}")
     parsed_vm = parsed_vm.merge(parsed_config).merge(cpu).merge(memory).merge(ostemplate)
-    networks.each { |network| parsed_vm = parsed_vm.merge(network) }
+    interfaces_to_add.each { |interface| parsed_vm = parsed_vm.merge(interface) }
+    parsed_vm = parsed_vm.merge(delete: interfaces_to_delete.join(',')) unless interfaces_to_delete.empty?
     volumes.each { |volume| parsed_vm = parsed_vm.merge(volume) }
     logger.debug("parse_container_vm(): #{parsed_vm}")
     parsed_vm
@@ -98,24 +99,17 @@ module ProxmoxContainerHelper
     disk = {}
     id = args['id']
     id = "mp#{args['device']}" if args.has_key?('device')
-    delete = args['_delete'].to_i == 1
     logger.debug("parse_container_volume() args=#{args}")
-    return args if ForemanFogProxmox::Value.empty?(id) || server_disk?(id)
+    return args if ForemanFogProxmox::Value.empty?(id) || Fog::Proxmox::DiskHelper.server_disk?(id)
     args.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
-    if delete
-      logger.debug("parse_container_volume(): delete id=#{id}")
-      disk.store(:delete, id)
-      disk
-    else
-      disk.store(:id, id)
-      disk.store(:volid, args['volid'])
-      disk.store(:storage, args['storage'].to_s)
-      disk.store(:size, args['size'].to_i)
-      options = args.reject { |key,_value| %w[id volid device storage size _delete].include? key}
-      disk.store(:options, options)
-      logger.debug("parse_container_volume(): add disk=#{disk}")
-      Fog::Proxmox::DiskHelper.flatten(disk)
-    end 
+    disk.store(:id, id)
+    disk.store(:volid, args['volid'])
+    disk.store(:storage, args['storage'].to_s)
+    disk.store(:size, args['size'].to_i)
+    options = args.reject { |key,_value| %w[id volid device storage size _delete].include? key}
+    disk.store(:options, options)
+    logger.debug("parse_container_volume(): disk=#{disk}")
+    Fog::Proxmox::DiskHelper.flatten(disk)
   end
 
   def parse_container_volumes(args)
@@ -126,34 +120,34 @@ module ProxmoxContainerHelper
     volumes
   end
 
-  def parse_container_interfaces(args)
-    nics = []
-    args.each_value { |value| nics.push(parse_container_interface(value))} if args
-    logger.debug("parse_container_interfaces(): nics=#{nics}")
-    nics
+  def parse_container_interfaces(interfaces_attributes)
+    interfaces_to_add = []
+    interfaces_to_delete = []
+    interfaces_attributes.each_value { |value| add_container_interface(value,interfaces_to_delete,interfaces_to_add) } if interfaces_attributes
+    logger.debug("parse_container_interfaces(): interfaces_to_add=#{interfaces_to_add}, interfaces_to_delete=#{interfaces_to_delete}")
+    [interfaces_to_add, interfaces_to_delete]
   end
 
-  def parse_container_interface(args)
-    args.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
+  def add_container_interface(interface_attributes, interfaces_to_delete, interfaces_to_add)
+    interface_attributes.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
     nic = {}
-    id = args['id']
+    id = interface_attributes['id']
     logger.debug("parse_container_interface(): id=#{id}")
-    delete = args['_delete'].to_i == 1
+    delete = interface_attributes['_delete'].to_i == 1
     if delete
-      logger.debug("parse_container_interface(): delete id=#{id}")
-      nic.store(:delete, id)
-      nic
+      interfaces_to_delete.push(id.to_s)
     else
       nic.store(:id, id)
-      nic.store(:name, args['name'].to_s)
-      nic.store(:bridge, args['bridge'].to_s) if args['bridge']
-      nic.store(:ip, args['ip'].to_s) if args['ip']
-      nic.store(:ip6, args['ip6'].to_s) if args['ip6']
-      nic.store(:rate, args['rate'].to_i) if args['rate']
-      nic.store(:tag, args['tag'].to_i) if args['tag']
+      nic.store(:macaddr, interface_attributes['macaddr']) if interface_attributes['macaddr']
+      nic.store(:name, interface_attributes['name'].to_s)
+      nic.store(:bridge, interface_attributes['bridge'].to_s) if interface_attributes['bridge']
+      nic.store(:ip, interface_attributes['ip'].to_s) if interface_attributes['ip']
+      nic.store(:ip6, interface_attributes['ip6'].to_s) if interface_attributes['ip6']
+      nic.store(:rate, interface_attributes['rate'].to_i) if interface_attributes['rate']
+      nic.store(:tag, interface_attributes['tag'].to_i) if interface_attributes['tag']
       logger.debug("parse_container_interface(): add nic=#{nic}")
-      Fog::Proxmox::NicHelper.flatten(nic)
-    end 
+      interfaces_to_add.push(Fog::Proxmox::NicHelper.flatten(nic))
+    end
   end
 
 end

data/app/helpers/proxmox_server_helper.rb

@@ -45,7 +45,7 @@ module ProxmoxServerHelper
     memory_a = %w[memory min_memory balloon shares]
     memory = parse_server_memory(config.select { |key,_value| memory_a.include? key })
     interfaces_attributes = args['interfaces_attributes']
-    networks = parse_server_interfaces(interfaces_attributes)
+    interfaces_to_add, interfaces_to_delete = parse_server_interfaces(interfaces_attributes)
     general_a = %w[node_id type config_attributes volumes_attributes interfaces_attributes firmware_type provision_method container_volumes server_volumes]
     logger.debug("general_a: #{general_a}")
     parsed_vm = args.reject { |key,value| general_a.include?(key) || ForemanFogProxmox::Value.empty?(value) }
@@ -57,7 +57,8 @@ module ProxmoxServerHelper
     parsed_config = config.reject { |key,value| config_a.include?(key) || ForemanFogProxmox::Value.empty?(value) }
     logger.debug("parse_server_config(): #{parsed_config}")
     parsed_vm = parsed_vm.merge(parsed_config).merge(cpu).merge(memory).merge(cdrom)
-    networks.each { |network| parsed_vm = parsed_vm.merge(network) }
+    interfaces_to_add.each { |interface| parsed_vm = parsed_vm.merge(interface) }
+    parsed_vm = parsed_vm.merge(delete: interfaces_to_delete.join(',')) unless interfaces_to_delete.empty?
     volumes.each { |volume| parsed_vm = parsed_vm.merge(volume) }
     logger.debug("parse_server_vm(): #{parsed_vm}")
     parsed_vm
@@ -108,20 +109,14 @@ module ProxmoxServerHelper
     return args if ForemanFogProxmox::Value.empty?(id) || id == 'rootfs'
     delete = args['_delete'].to_i == 1
     args.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
-    if delete
-      logger.debug("parse_server_volume(): delete id=#{id}")
-      disk.store(:delete, id)
-      disk
-    else
-      disk.store(:id, id)
-      disk.store(:volid, args['volid']) if args.has_key?('volid')
-      disk.store(:storage, args['storage'].to_s) if args.has_key?('storage')
-      disk.store(:size, args['size'].to_i) if args.has_key?('size')
-      options = args.reject { |key,_value| %w[id volid controller device storage size _delete].include? key}
-      disk.store(:options, options)
-      logger.debug("parse_server_volume(): add disk=#{disk}")
-      Fog::Proxmox::DiskHelper.flatten(disk)
-    end 
+    disk.store(:id, id)
+    disk.store(:volid, args['volid']) if args.has_key?('volid')
+    disk.store(:storage, args['storage'].to_s) if args.has_key?('storage')
+    disk.store(:size, args['size'].to_i) if args.has_key?('size')
+    options = args.reject { |key,_value| %w[id volid controller device storage size _delete].include? key}
+    disk.store(:options, options)
+    logger.debug("parse_server_volume(): disk=#{disk}")
+    Fog::Proxmox::DiskHelper.flatten(disk)
   end
 
   def parse_server_volumes(args)
@@ -131,35 +126,35 @@ module ProxmoxServerHelper
     volumes
   end
 
-  def parse_server_interfaces(args)
-    nics = []
-    args.each_value { |value| nics.push(parse_server_interface(value))} if args
-    logger.debug("parse_server_interfaces(): nics=#{nics}")
-    nics
+  def parse_server_interfaces(interfaces_attributes)
+    interfaces_to_add = []
+    interfaces_to_delete = []
+    interfaces_attributes.each_value { |value| add_server_interface(value,interfaces_to_delete,interfaces_to_add)} if interfaces_attributes
+    logger.debug("parse_server_interfaces(): interfaces_to_delete=#{interfaces_to_delete} interfaces_to_add=#{interfaces_to_add}")
+    [interfaces_to_add, interfaces_to_delete]
   end
 
-  def parse_server_interface(args)
-    args.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
+  def add_server_interface(interface_attributes, interfaces_to_delete, interfaces_to_add)
+    interface_attributes.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
     nic = {}
-    id = args['id']
-    logger.debug("parse_server_interface(): id=#{id}")
-    delete = args['_delete'].to_i == 1
+    id = interface_attributes['id']
+    logger.debug("add_server_interface(): id=#{id}")
+    delete = interface_attributes['_delete'].to_i == 1
     if delete
-      logger.debug("parse_server_interface(): delete id=#{id}")
-      nic.store(:delete, id)
-      nic
+      interfaces_to_delete.push(id.to_s)
     else
       nic.store(:id, id)
-      nic.store(:tag, args['tag'].to_i) if args['tag']
-      nic.store(:model, args['model'].to_s)
-      nic.store(:bridge, args['bridge'].to_s) if args['bridge']
-      nic.store(:firewall, args['firewall'].to_i) if args['firewall']
-      nic.store(:rate, args['rate'].to_i) if args['rate']
-      nic.store(:link_down, args['link_down'].to_i) if args['link_down']
-      nic.store(:queues, args['queues'].to_i) if args['queues']
-      logger.debug("parse_server_interface(): add nic=#{nic}")
-      Fog::Proxmox::NicHelper.flatten(nic)
-    end 
+      nic.store(:macaddr, interface_attributes['macaddr']) if interface_attributes['macaddr']
+      nic.store(:tag, interface_attributes['tag'].to_i) if interface_attributes['tag']
+      nic.store(:model, interface_attributes['model'].to_s)
+      nic.store(:bridge, interface_attributes['bridge'].to_s) if interface_attributes['bridge']
+      nic.store(:firewall, interface_attributes['firewall'].to_i) if interface_attributes['firewall']
+      nic.store(:rate, interface_attributes['rate'].to_i) if interface_attributes['rate']
+      nic.store(:link_down, interface_attributes['link_down'].to_i) if interface_attributes['link_down']
+      nic.store(:queues, interface_attributes['queues'].to_i) if interface_attributes['queues']
+      logger.debug("add_server_interface(): add nic=#{nic}")
+      interfaces_to_add.push(Fog::Proxmox::NicHelper.flatten(nic))
+    end
   end
 
 end

data/app/helpers/proxmox_vm_helper.rb

@@ -33,10 +33,8 @@ module ProxmoxVmHelper
     type = vm.config.attributes['type']
     type = vm.type unless type
     main = vm.attributes.select { |key,_value| main_a.include? key }
-    disks_regexp = /^(scsi|sata|mp|rootfs|virtio|ide)(\d+){0,1}$/
-    nics_regexp = /^(net)(\d+)/
     main_a += %w[templated]
-    config = vm.config.attributes.reject { |key,_value| main_a.include?(key) || disks_regexp.match(key) || nics_regexp.match(key)  }
+    config = vm.config.attributes.reject { |key,_value| main_a.include?(key) || Fog::Proxmox::DiskHelper.disk?(key) || Fog::Proxmox::NicHelper.nic?(key)  }
     vm_h = vm_h.merge(main)
     vm_h = vm_h.merge({'config_attributes': config})
     vm_h
@@ -80,21 +78,4 @@ module ProxmoxVmHelper
     config_hash.store(key, memory)
   end
 
-  def parse_type_and_vmid(uuid)
-    uuid_regexp = /^(lxc|qemu)\_(\d+)$/
-    raise ::Foreman::Exception.new _("Invalid uuid=[%{uuid}]." % { uuid: uuid }) unless uuid.match(uuid_regexp)
-    id_a = uuid.scan(uuid_regexp).first
-    type = id_a[0]
-    vmid = id_a[1]
-    return type, vmid
-  end
-
-  def mount_point_disk?(id)
-    /^(mp)(\d+)$/.match?(id)
-  end
-
-  def server_disk?(id)
-    /^(scsi|sata|virtio|ide)(\d+)$/.match?(id)
-  end
-
 end

data/app/models/concerns/fog_extensions/proxmox/interface.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# 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/>.
+
+module FogExtensions
+    module Proxmox
+        module Interface
+            extend ActiveSupport::Concern
+            def mac
+                macaddr
+            end
+        end
+    end
+end   

data/app/models/concerns/fog_extensions/proxmox/node.rb

@@ -26,6 +26,19 @@ module FogExtensions
                 vms += containers.all
                 vms
             end
+            def each(collection_filters = {})
+                if block_given?
+                Kernel.loop do
+                    break unless collection_filters[:marker]
+                    page = all(collection_filters)
+                    # We need to explicitly use the base 'each' method here on the page,
+                    #  otherwise we get infinite recursion
+                    base_each = Fog::Collection.instance_method(:each)
+                    base_each.bind(page).call { |item| yield item }
+                end
+                end
+                self
+            end
         end
     end
 end  

data/app/models/concerns/fog_extensions/proxmox/server.rb

@@ -57,11 +57,14 @@ module FogExtensions
             def interfaces
                 config.interfaces
             end
+            def nics
+                config.interfaces.collect { |nic| nic.to_s }
+            end
             def volumes
                 config.disks.reject { |disk| disk.cdrom? }
             end
             def disks
-                config.disks.collect { |disk| disk.id+': '+disk.volid }
+                config.disks.collect { |disk| disk.to_s }
             end
             def vga
                 config.vga