foreman_fog_proxmox 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 481cace7d30a49fb40a61fe50041ff10a278d674fd0420eca29c6bb756dfff9d
-  data.tar.gz: ff60cb1dd7b8793c19146431ed0c41b7f15a9e7a2379474f7b6ef80f6c8ee213
+  metadata.gz: a89e9ca117817df602b86ef2526b7b9609ada877f243537dafa986bfd914ba1d
+  data.tar.gz: d446b8b4fa4ec604e8c6a883c5c1ded87787df79dc1243c445e3c5e6bc3a811e
 SHA512:
-  metadata.gz: e6eb265bcc6d768b55d10df5987bd3fa003960f7adbb54072d54edb46a84e5f5bb51b16565665f497ef2848ae996a80f58132ebe8c2be8370ce044cb945a9ff6
-  data.tar.gz: ccc4f415b32b1ef39a628a2d30048464612c35707c5be757248e0e69dddf2c314f5dbbf066c0f219506a164e61610935af7794f76bdf26864f4897e42b7ac139
+  metadata.gz: b0623b6a0ab2b6d8b9b247e3bad1808fc07cf49edf58997a3199161567c151aea9e464eba9f60724aa6d0d3192f93f59c621e3b3aad45e3c1c262bb163f12b3a
+  data.tar.gz: 48c023299b4d8801b6b6a2784530a52e92ba74ddb4a8c288a5ccc1b7ae9db9be2cafcd6ee35cf8239aa757d4f975fddc60b0e160fb1db4489a90a3fb86425b46

data/README.md

@@ -18,7 +18,7 @@ If you like it and need more features you can [support](.github/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.8 |=5.4|>=0.7|>=1.22|>=2.3|
 
 ## Installation
 
@@ -131,6 +131,10 @@ gem 'simplecov' # test
 bundle install --without libvirt postgresql mysql2
 ```
 
+```shell
+npm install
+```
+
 * Configure foreman settings:
 
 ```shell
@@ -169,6 +173,12 @@ export DISABLE_SPRING=true
 bundle exec bin/rake test TEST=test/functional/compute_resources_controller_test.rb
 ```
 
+* See deface overrides result:
+
+```shell
+bundle exec bin/rake deface:get_result['hosts/_compute_detail']
+```
+
 * In foreman directory, after you modify foreman_fog_proxmox specific assets (proxmox.js, etc) you have to precompile it:
 
 ```shell

data/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -38,7 +40,7 @@ task default: :test
 begin
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new
-rescue StandardError => _
+rescue StandardError => _e
   puts 'Rubocop not loaded.'
 end
 

data/app/controllers/concerns/foreman_fog_proxmox/controller/parameters/compute_resource.rb

@@ -25,9 +25,9 @@ module ForemanFogProxmox
 
         class_methods do
           def compute_resource_params_filter
-            super.tap do |filter|   
+            super.tap do |filter|
               filter.permit :ssl_verify_peer,
-                :ssl_certs, :node_id, :disable_proxy, :cr_id
+                            :ssl_certs, :node_id, :disable_proxy, :cr_id, :renew
             end
           end
 

data/app/controllers/foreman_fog_proxmox/compute_resources_controller.rb

@@ -23,7 +23,7 @@ module ForemanFogProxmox
 
     # GET foreman_fog_proxmox/isos/:storage
     def isos
-      volumes = @compute_resource.images_by_storage('iso',params[:storage])
+      volumes = @compute_resource.images_by_storage(params[:storage], 'iso')
       respond_to do |format|
         format.json { render :json => volumes }
       end
@@ -31,7 +31,7 @@ module ForemanFogProxmox
 
     # GET foreman_fog_proxmox/ostemplates/:storage
     def ostemplates
-      volumes = @compute_resource.images_by_storage('vztmpl',params[:storage])
+      volumes = @compute_resource.images_by_storage(params[:storage], 'vztmpl')
       respond_to do |format|
         format.json { render :json => volumes }
       end

data/app/helpers/node_dashboard_helper.rb

@@ -18,19 +18,18 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module NodeDashboardHelper
-    
-    def compute_data(statistics)
-        data = []
-        statistics.each do |statistic| 
-            t = Time.at(statistic['time'])
-            x = t.hour.to_s + ':' + t.min.to_s
-            data << [x,statistic['loadavg']*100]
-        end
-        data
+  def compute_data(statistics)
+    data = []
+    statistics.each do |statistic|
+      t = Time.zone.at(statistic['time'])
+      x = t.hour.to_s + ':' + t.min.to_s
+      data << [x, statistic['loadavg'] * 100]
     end
+    data
+  end
 
-    def render_node_statistics(statistics,options = {})
-        data = compute_data(statistics)
-        flot_bar_chart("node_statistics", _("Time"), _("Average load (x100)"), data, options)
-    end
-end
+  def render_node_statistics(statistics, options = {})
+    data = compute_data(statistics)
+    flot_bar_chart('node_statistics', _('Time'), _('Average load (x100)'), data, options)
+  end
+end

data/app/helpers/proxmox_compute_selectors_helper.rb

@@ -18,7 +18,6 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ProxmoxComputeSelectorsHelper
-
   def proxmox_types_map
     [OpenStruct.new(id: 'qemu', name: 'KVM/Qemu server'),
      OpenStruct.new(id: 'lxc', name: 'LXC container')]
@@ -28,7 +27,7 @@ module ProxmoxComputeSelectorsHelper
     [OpenStruct.new(id: 'amd64', name: '64 bits'),
      OpenStruct.new(id: 'i386', name: '32 bits')]
   end
-  
+
   def proxmox_ostypes_map
     [OpenStruct.new(id: 'debian', name: 'Debian'),
      OpenStruct.new(id: 'ubuntu', name: 'Ubuntu'),
@@ -42,29 +41,29 @@ module ProxmoxComputeSelectorsHelper
   end
 
   def proxmox_controllers_map
-    [ForemanFogProxmox::OptionsSelect.new(id:'ide', name: 'IDE', range: 3), 
-      ForemanFogProxmox::OptionsSelect.new(id:'sata', name: 'SATA', range: 5), 
-      ForemanFogProxmox::OptionsSelect.new(id:'scsi', name: 'SCSI', range: 13), 
-      ForemanFogProxmox::OptionsSelect.new(name:'VirtIO Block', id: 'virtio', range: 15)]
+    [ForemanFogProxmox::OptionsSelect.new(id: 'ide', name: 'IDE', range: 3),
+     ForemanFogProxmox::OptionsSelect.new(id: 'sata', name: 'SATA', range: 5),
+     ForemanFogProxmox::OptionsSelect.new(id: 'scsi', name: 'SCSI', range: 13),
+     ForemanFogProxmox::OptionsSelect.new(name: 'VirtIO Block', id: 'virtio', range: 15)]
   end
 
   def proxmox_operating_systems_map
-     [OpenStruct.new(id: 'other', name: 'Unspecified OS'),
-      OpenStruct.new(id: 'wxp', name: 'Microsoft Windows XP'),
-      OpenStruct.new(id: 'w2k', name: 'Microsoft Windows 2000'),
-      OpenStruct.new(id: 'w2k3', name: 'Microsoft Windows 2003'),
-      OpenStruct.new(id: 'w2k8', name: 'Microsoft Windows 2008'),
-      OpenStruct.new(id: 'wvista', name: 'Microsoft Windows Vista'),
-      OpenStruct.new(id: 'win7', name: 'Microsoft Windows 7'),
-      OpenStruct.new(id: 'win8', name: 'Microsoft Windows 8/2012/2012r2'),
-      OpenStruct.new(id: 'win10', name: 'Microsoft Windows 10/2016'),
-      OpenStruct.new(id: 'l24', name: 'Linux 2.4 Kernel'),
-      OpenStruct.new(id: 'l26', name: 'Linux 2.6/3.X + Kernel'),
-      OpenStruct.new(id: 'solaris', name: 'Solaris/OpenSolaris/OpenIndiania kernel')]
+    [OpenStruct.new(id: 'other', name: 'Unspecified OS'),
+     OpenStruct.new(id: 'wxp', name: 'Microsoft Windows XP'),
+     OpenStruct.new(id: 'w2k', name: 'Microsoft Windows 2000'),
+     OpenStruct.new(id: 'w2k3', name: 'Microsoft Windows 2003'),
+     OpenStruct.new(id: 'w2k8', name: 'Microsoft Windows 2008'),
+     OpenStruct.new(id: 'wvista', name: 'Microsoft Windows Vista'),
+     OpenStruct.new(id: 'win7', name: 'Microsoft Windows 7'),
+     OpenStruct.new(id: 'win8', name: 'Microsoft Windows 8/2012/2012r2'),
+     OpenStruct.new(id: 'win10', name: 'Microsoft Windows 10/2016'),
+     OpenStruct.new(id: 'l24', name: 'Linux 2.4 Kernel'),
+     OpenStruct.new(id: 'l26', name: 'Linux 2.6/3.X + Kernel'),
+     OpenStruct.new(id: 'solaris', name: 'Solaris/OpenSolaris/OpenIndiania kernel')]
   end
 
   def proxmox_vgas_map
-     [OpenStruct.new(id: 'std', name: 'Standard VGA'),
+    [OpenStruct.new(id: 'std', name: 'Standard VGA'),
      OpenStruct.new(id: 'vmware', name: 'Vmware compatible'),
      OpenStruct.new(id: 'qxl', name: 'SPICE'),
      OpenStruct.new(id: 'qxl2', name: 'SPICE 2 monnitors'),
@@ -78,39 +77,39 @@ module ProxmoxComputeSelectorsHelper
 
   def proxmox_keyboards_map
     [OpenStruct.new(id: 'de', name: 'Deutsch'),
-    OpenStruct.new(id: 'de-ch', name: 'Deutsch (Swiss)'),
-    OpenStruct.new(id: 'da', name: 'Danish'), 
-    OpenStruct.new(id: 'en-gb', name: 'English (UK)'), 
-    OpenStruct.new(id: 'en-us', name: 'English (US)'),  
-    OpenStruct.new(id: 'es', name: 'Spanish'),
-    OpenStruct.new(id: 'fi', name: 'Finnish'), 
-    OpenStruct.new(id: 'fr', name: 'French'),
-    OpenStruct.new(id: 'fr-be', name: 'French (Belgium)'), 
-    OpenStruct.new(id: 'fr-ca', name: 'French (Canadian)'),
-    OpenStruct.new(id: 'fr-ch', name: 'French (Swiss)'),
-    OpenStruct.new(id: 'hu', name: 'Hungarian'),
-    OpenStruct.new(id: 'is', name: 'Israelian'), 
-    OpenStruct.new(id: 'it', name: 'Italian'), 
-    OpenStruct.new(id: 'ja', name: 'Japanese'), 
-    OpenStruct.new(id: 'lt', name: 'Lituanian'), 
-    OpenStruct.new(id: 'mk', name: ''),
-    OpenStruct.new(id: 'nl', name: 'Nederland'), 
-    OpenStruct.new(id: 'no', name: 'Norway'), 
-    OpenStruct.new(id: 'pl', name: 'Polish'), 
-    OpenStruct.new(id: 'pt', name: 'Portugese'),
-    OpenStruct.new(id: 'pt-br', name: 'Portugese (Brasilian)'),
-    OpenStruct.new(id: 'sv', name: 'Sv'),
-    OpenStruct.new(id: 'sl', name: 'Slovakian'),
-    OpenStruct.new(id: 'tr', name: 'Tr')]
+     OpenStruct.new(id: 'de-ch', name: 'Deutsch (Swiss)'),
+     OpenStruct.new(id: 'da', name: 'Danish'),
+     OpenStruct.new(id: 'en-gb', name: 'English (UK)'),
+     OpenStruct.new(id: 'en-us', name: 'English (US)'),
+     OpenStruct.new(id: 'es', name: 'Spanish'),
+     OpenStruct.new(id: 'fi', name: 'Finnish'),
+     OpenStruct.new(id: 'fr', name: 'French'),
+     OpenStruct.new(id: 'fr-be', name: 'French (Belgium)'),
+     OpenStruct.new(id: 'fr-ca', name: 'French (Canadian)'),
+     OpenStruct.new(id: 'fr-ch', name: 'French (Swiss)'),
+     OpenStruct.new(id: 'hu', name: 'Hungarian'),
+     OpenStruct.new(id: 'is', name: 'Israelian'),
+     OpenStruct.new(id: 'it', name: 'Italian'),
+     OpenStruct.new(id: 'ja', name: 'Japanese'),
+     OpenStruct.new(id: 'lt', name: 'Lituanian'),
+     OpenStruct.new(id: 'mk', name: ''),
+     OpenStruct.new(id: 'nl', name: 'Nederland'),
+     OpenStruct.new(id: 'no', name: 'Norway'),
+     OpenStruct.new(id: 'pl', name: 'Polish'),
+     OpenStruct.new(id: 'pt', name: 'Portugese'),
+     OpenStruct.new(id: 'pt-br', name: 'Portugese (Brasilian)'),
+     OpenStruct.new(id: 'sv', name: 'Sv'),
+     OpenStruct.new(id: 'sl', name: 'Slovakian'),
+     OpenStruct.new(id: 'tr', name: 'Tr')]
   end
 
   def get_controller(id)
-    proxmox_controllers_map.find { |controller| controller.id == id}
+    proxmox_controllers_map.find { |controller| controller.id == id }
   end
 
   def proxmox_max_device(id)
     options_select = get_controller(id)
-    options_select ? options_select.range  : 1
+    options_select ? options_select.range : 1
   end
 
   def proxmox_caches_map
@@ -158,14 +157,14 @@ module ProxmoxComputeSelectorsHelper
      OpenStruct.new(id: 'lsi53c810', name: 'lsi53c810'),
      OpenStruct.new(id: 'megasas', name: 'megasas'),
      OpenStruct.new(id: 'virtio-scsi-pci', name: 'virtio-scsi-pci'),
-      OpenStruct.new(id: 'virtio-scsi-single', name: 'virtio-scsi-single'),
+     OpenStruct.new(id: 'virtio-scsi-single', name: 'virtio-scsi-single'),
      OpenStruct.new(id: 'pvscsi', name: 'pvscsi')]
   end
 
   def proxmox_networkcards_map
-    [OpenStruct.new(id: 'e1000', name:  'Intel E1000'),
-      OpenStruct.new(id: 'virtio', name:  'VirtIO (paravirtualized)'),
-      OpenStruct.new(id: 'rtl8139', name:  'Realtek RTL8139'),
-        OpenStruct.new(id: 'vmxnet3', name:  'VMware vmxnet3')]
+    [OpenStruct.new(id: 'e1000', name: 'Intel E1000'),
+     OpenStruct.new(id: 'virtio', name: 'VirtIO (paravirtualized)'),
+     OpenStruct.new(id: 'rtl8139', name: 'Realtek RTL8139'),
+     OpenStruct.new(id: 'vmxnet3', name: 'VMware vmxnet3')]
   end
 end

data/app/helpers/proxmox_container_helper.rb

@@ -22,10 +22,25 @@ require 'fog/proxmox/helpers/nic_helper'
 require 'foreman_fog_proxmox/value'
 
 module ProxmoxContainerHelper
+  def config_keys
+    keys = { general: ['node_id', 'name', 'type', 'config_attributes', 'volumes_attributes', 'interfaces_attributes', 'firmware_type', 'provision_method', 'container_volumes', 'server_volumes'] }
+    keys.store(:main, ['name', 'type', 'node_id', 'vmid', 'interfaces', 'mount_points', 'disks'])
+    keys.store(:cpu, ['arch', 'cpulimit', 'cpuunits', 'cores'])
+    keys.store(:memory, ['memory', 'swap'])
+    keys
+  end
 
-  KILO = 1024
-  MEGA = KILO * KILO
-  GIGA = KILO * MEGA
+  def ostemplate_keys
+    ['ostemplate', 'ostemplate_storage', 'ostemplate_file']
+  end
+
+  def parse_ostemplate_without_keys(args)
+    parse_container_ostemplate(args.select { |key, _value| ostemplate_keys.include? key })
+  end
+
+  def config_general_or_ostemplate_key?(key)
+    config_keys[:general].include?(key) || ostemplate_keys.include?(key)
+  end
 
   def parse_container_vm(args)
     logger.debug("parse_container_vm args=#{args}")
@@ -33,28 +48,19 @@ module ProxmoxContainerHelper
     return {} unless args
     return {} if args.empty?
     return {} unless args['type'] == 'lxc'
+
     config = args['config_attributes']
-    main_a = %w[name type node_id vmid interfaces mount_points disks]
-    config = args.reject { |key,_value| main_a.include? key } unless config
-    ostemplate_a = %w[ostemplate ostemplate_storage ostemplate_file]
-    ostemplate = parse_container_ostemplate(args.select { |key,_value| ostemplate_a.include? key })
-    ostemplate = parse_container_ostemplate(config.select { |key,_value| ostemplate_a.include? key }) unless ostemplate[:ostemplate]
+    config ||= args.reject { |key, _value| config_keys[:main].include? key }
+    ostemplate = parse_ostemplate_without_keys(args)
+    ostemplate = parse_ostemplate_without_keys(config) unless ostemplate[:ostemplate]
     volumes = parse_container_volumes(args['volumes_attributes'])
-    cpu_a = %w[arch cpulimit cpuunits cores]
-    cpu = parse_container_cpu(config.select { |key,_value| cpu_a.include? key })
-    memory_a = %w[memory swap]
-    memory = parse_container_memory(config.select { |key,_value| memory_a.include? key })
+    cpu = parse_container_cpu(config.select { |key, _value| config_keys[:cpu].include? key })
+    memory = parse_container_memory(config.select { |key, _value| config_keys[:memory].include? key })
     interfaces_attributes = args['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) }
-    config_a = []
-    config_a += cpu_a
-    config_a += memory_a
-    config_a += main_a
-    config_a += general_a
-    parsed_config = config.reject { |key,value| config_a.include?(key) || ForemanFogProxmox::Value.empty?(value) }
+    logger.debug("config_keys[:general]: #{config_keys[:general]}")
+    parsed_vm = args.reject { |key, value| config_general_or_ostemplate_key?(key) || ForemanFogProxmox::Value.empty?(value) }
+    parsed_config = config.reject { |key, value| config_keys.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)
     interfaces_to_add.each { |interface| parsed_vm = parsed_vm.merge(interface) }
@@ -65,8 +71,8 @@ module ProxmoxContainerHelper
   end
 
   def parse_container_memory(args)
-    memory = {} 
-    args.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
+    memory = {}
+    args.delete_if { |_key, value| ForemanFogProxmox::Value.empty?(value) }
     memory.store(:memory, args['memory'].to_i) if args['memory']
     memory.store(:swap, args['swap'].to_i) if args['swap']
     logger.debug("parse_container_memory(): #{memory}")
@@ -75,7 +81,7 @@ module ProxmoxContainerHelper
 
   def parse_container_cpu(args)
     cpu = {}
-    args.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
+    args.delete_if { |_key, value| ForemanFogProxmox::Value.empty?(value) }
     cpu.store(:arch, args['arch'].to_s) if args['arch']
     cpu.store(:cpulimit, args['cpulimit'].to_i) if args['cpulimit']
     cpu.store(:cpuunits, args['cpuunits'].to_i) if args['cpuunits']
@@ -87,10 +93,10 @@ module ProxmoxContainerHelper
   def parse_container_ostemplate(args)
     ostemplate = args['ostemplate']
     ostemplate_file = args['ostemplate_file']
-    ostemplate = ostemplate ? ostemplate : ostemplate_file
+    ostemplate ||= ostemplate_file
     ostemplate_storage = args['ostemplate_storage']
-    ostemplate_storage, ostemplate_file, _size  = Fog::Proxmox::DiskHelper.extract_storage_volid_size(ostemplate) unless ForemanFogProxmox::Value.empty?(ostemplate)
-    parsed_ostemplate = {ostemplate: ostemplate, ostemplate_file: ostemplate_file, ostemplate_storage: ostemplate_storage}
+    ostemplate_storage, ostemplate_file, _size = Fog::Proxmox::DiskHelper.extract_storage_volid_size(ostemplate) unless ForemanFogProxmox::Value.empty?(ostemplate)
+    parsed_ostemplate = { ostemplate: ostemplate, ostemplate_file: ostemplate_file, ostemplate_storage: ostemplate_storage }
     logger.debug("parse_container_ostemplate(): #{parsed_ostemplate}")
     parsed_ostemplate
   end
@@ -98,15 +104,16 @@ module ProxmoxContainerHelper
   def parse_container_volume(args)
     disk = {}
     id = args['id']
-    id = "mp#{args['device']}" if args.has_key?('device')
+    id = "mp#{args['device']}" if args.key?('device')
     logger.debug("parse_container_volume() args=#{args}")
     return args if ForemanFogProxmox::Value.empty?(id) || Fog::Proxmox::DiskHelper.server_disk?(id)
-    args.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
+
+    args.delete_if { |_key, value| ForemanFogProxmox::Value.empty?(value) }
     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}
+    options = args.reject { |key, _value| ['id', 'volid', 'device', 'storage', 'size', '_delete'].include? key }
     disk.store(:options, options)
     logger.debug("parse_container_volume(): disk=#{disk}")
     Fog::Proxmox::DiskHelper.flatten(disk)
@@ -115,7 +122,7 @@ module ProxmoxContainerHelper
   def parse_container_volumes(args)
     logger.debug("parse_container_volumes() args=#{args}")
     volumes = []
-    args.each_value { |value| volumes.push(parse_container_volume(value))} if args
+    args&.each_value { |value| volumes.push(parse_container_volume(value)) }
     logger.debug("parse_container_volumes(): volumes=#{volumes}")
     volumes
   end
@@ -123,13 +130,13 @@ module ProxmoxContainerHelper
   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
+    interfaces_attributes&.each_value { |value| add_container_interface(value, interfaces_to_delete, interfaces_to_add) }
     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 add_container_interface(interface_attributes, interfaces_to_delete, interfaces_to_add)
-    interface_attributes.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
+    interface_attributes.delete_if { |_key, value| ForemanFogProxmox::Value.empty?(value) }
     nic = {}
     id = interface_attributes['id']
     logger.debug("parse_container_interface(): id=#{id}")
@@ -138,7 +145,7 @@ module ProxmoxContainerHelper
       interfaces_to_delete.push(id.to_s)
     else
       nic.store(:id, id)
-      nic.store(:macaddr, interface_attributes['macaddr']) if interface_attributes['macaddr']
+      nic.store(:hwaddr, 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']
@@ -149,5 +156,4 @@ module ProxmoxContainerHelper
       interfaces_to_add.push(Fog::Proxmox::NicHelper.flatten(nic))
     end
   end
-
-end
+end

data/app/helpers/proxmox_form_helper.rb

@@ -18,55 +18,53 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ProxmoxFormHelper
-
-def password_proxmox_f(f, attr, options = {})
+  def password_proxmox_f(f, attr, options = {})
     unset_button = options.delete(:unset)
     value = f.object[attr] if options.delete(:keep_value)
     password_field_tag(:fakepassword, value, :style => 'display: none', :autocomplete => 'new-password-fake') +
-        field(f, attr, options) do
-          options[:autocomplete]   ||= 'new-password'
-          options[:placeholder]    ||= password_proxmox_placeholder(f.object, attr)
-          options[:disabled] = true if unset_button
-          options[:value] = value if value.present?
-          addClass options, 'form-control'
-          pass = f.password_field(attr, options) +
-              '<span class="glyphicon glyphicon-warning-sign input-addon"
-             title="'.html_safe + _('Caps lock ON') +
-              '" style="display:none"></span>'.html_safe
-          if unset_button
-            button = link_to_function(icon_text("edit", "", :kind => "pficon"), 'toggle_input_group(this)', {:id => 'disable-pass-btn', :class => 'btn btn-default', :title => _("Change the password")})
-            input_group(pass, input_group_btn(button))
-          else
-            pass
-          end
+      field(f, attr, options) do
+        options[:autocomplete]   ||= 'new-password'
+        options[:placeholder]    ||= password_proxmox_placeholder(f.object, attr)
+        options[:disabled] = true if unset_button
+        options[:value] = value if value.present?
+        addClass options, 'form-control'
+        pass = f.password_field(attr, options) +
+               content_tag(:span, '', class: 'glyphicon glyphicon-warning-sign input-addon',
+                                      title: 'Caps lock ON', style: 'display:none')
+        if unset_button
+          button = link_to_function(icon_text('edit', '', :kind => 'pficon'), 'toggle_input_group(this)', :id => 'disable-pass-btn', :class => 'btn btn-default', :title => _('Change the password'))
+          input_group(pass, input_group_btn(button))
+        else
+          pass
         end
-end
+      end
+  end
 
   def password_proxmox_placeholder(obj, attr = nil)
-    pass = obj.attributes.has_key?(attr)
-    pass ? "********" : ''
+    pass = obj.attributes.key?(attr)
+    pass ? '********' : ''
   end
-  
-  def new_child_fields_template_typed(form_builder, association, options = { })
-  unless options[:object].present?
-    association_object = form_builder.object.class.reflect_on_association(association)
-    options[:object] = association_object.klass.new(association_object.foreign_key => form_builder.object.id)
-  end
-  options[:partial]            ||= association.to_s.singularize
-  options[:form_builder_local] ||= :f
-  options[:form_builder_attrs] ||= {}
 
-  content_tag(:div, :class => "#{options[:type]}_#{association}_fields_template form_template #{}", :style => "display: none;") do
-    form_builder.fields_for(association, options[:object], :child_index => "new_#{options[:type]}_#{association}") do |f|
-      render(:partial => options[:partial], :layout => options[:layout],
-             :locals => { options[:form_builder_local] => f }.merge(options[:form_builder_attrs]))
+  def new_child_fields_template_typed(form_builder, association, options = {})
+    if options[:object].blank?
+      association_object = form_builder.object.class.reflect_on_association(association)
+      options[:object] = association_object.klass.new(association_object.foreign_key => form_builder.object.id)
+    end
+    options[:partial]            ||= association.to_s.singularize
+    options[:form_builder_local] ||= :f
+    options[:form_builder_attrs] ||= {}
+
+    content_tag(:div, :class => "#{options[:type]}_#{association}_fields_template form_template ", :style => 'display: none;') do
+      form_builder.fields_for(association, options[:object], :child_index => "new_#{options[:type]}_#{association}") do |f|
+        render(:partial => options[:partial], :layout => options[:layout],
+               :locals => { options[:form_builder_local] => f }.merge(options[:form_builder_attrs]))
+      end
     end
   end
-end
 
-def add_child_link_typed(name, association, type, opts = {})
-  opts[:class] = [opts[:class], "add_nested_fields btn btn-primary"].compact.join(" ")
-  opts[:"data-association"] = (type + '_' + association.to_s).to_sym
-  link_to_function(name.to_s, "add_child_node(this);tfm.numFields.initAll();", opts)
-end
+  def add_child_link_typed(name, association, type, opts = {})
+    opts[:class] = [opts[:class], 'add_nested_fields btn btn-primary'].compact.join(' ')
+    opts[:"data-association"] = (type + '_' + association.to_s).to_sym
+    link_to_function(name.to_s, 'add_child_node(this);tfm.numFields.initAll();', opts)
+  end
 end