foreman_fog_proxmox 0.8.0 → 0.8.2

data/app/helpers/proxmox_server_helper.rb

@@ -22,39 +22,35 @@ require 'fog/proxmox/helpers/nic_helper'
 require 'foreman_fog_proxmox/value'
 
 module ProxmoxServerHelper
-
-  KILO = 1024
-  MEGA = KILO * KILO
-  GIGA = KILO * MEGA
-
   def parse_server_vm(args)
     logger.debug("parse_server_vm args=#{args}")
     args = ActiveSupport::HashWithIndifferentAccess.new(args)
     return {} unless args
     return {} if args.empty?
     return {} unless args['type'] == 'qemu'
+
     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
-    cdrom_a = %w[cdrom cdrom_storage cdrom_iso]
-    cdrom = parse_server_cdrom(config.select { |key,_value| cdrom_a.include? key })
+    main_a = ['name', 'type', 'node_id', 'vmid', 'interfaces', 'mount_points', 'disks']
+    config ||= args.reject { |key, _value| main_a.include? key }
+    cdrom_a = ['cdrom', 'cdrom_storage', 'cdrom_iso']
+    cdrom = parse_server_cdrom(config.select { |key, _value| cdrom_a.include? key })
     vols = args['volumes_attributes']
     volumes = parse_server_volumes(vols)
-    cpu_a = %w[cpu_type spectre pcid]
-    cpu = parse_server_cpu(config.select { |key,_value| cpu_a.include? key })
-    memory_a = %w[memory min_memory balloon shares]
-    memory = parse_server_memory(config.select { |key,_value| memory_a.include? key })
+    cpu_a = ['cpu_type', 'spectre', 'pcid']
+    cpu = parse_server_cpu(config.select { |key, _value| cpu_a.include? key })
+    memory_a = ['memory', 'min_memory', 'balloon', 'shares']
+    memory = parse_server_memory(config.select { |key, _value| memory_a.include? key })
     interfaces_attributes = args['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]
+    general_a = ['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) }
+    parsed_vm = args.reject { |key, value| general_a.include?(key) || ForemanFogProxmox::Value.empty?(value) }
     config_a = []
     config_a += cpu_a
     config_a += cdrom_a
     config_a += memory_a
     config_a += general_a
-    parsed_config = config.reject { |key,value| config_a.include?(key) || ForemanFogProxmox::Value.empty?(value) }
+    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)
     interfaces_to_add.each { |interface| parsed_vm = parsed_vm.merge(interface) }
@@ -65,29 +61,30 @@ module ProxmoxServerHelper
   end
 
   def parse_server_memory(args)
-    memory = { }
-    memory.store(:memory,args['memory'].to_i) if args['memory']
+    memory = {}
+    memory.store(:memory, args['memory'].to_i) if args['memory']
     ballooned = args['balloon'].to_i == 1
     if ballooned
-      memory.store(:shares,args['shares'].to_i) if args['shares']
-      memory.store(:min_memory,args['min_memory'].to_i) if args['min_memory']
+      memory.store(:shares, args['shares'].to_i) if args['shares']
+      memory.store(:min_memory, args['min_memory'].to_i) if args['min_memory']
     end
-    memory.store(:balloon,args['balloon'].to_i) if args['balloon']
+    memory.store(:balloon, args['balloon'].to_i) if args['balloon']
     logger.debug("parse_server_memory(): #{memory}")
     memory
   end
 
   def parse_server_cpu(args)
     return {} unless args['cpu_type']
+
     cpu = "cputype=#{args['cpu_type']}"
     spectre = args['spectre'].to_i == 1
     pcid = args['pcid'].to_i == 1
-    cpu += ",flags=" if spectre || pcid
-    cpu += "+spec-ctrl" if spectre
-    cpu += ";" if spectre && pcid
-    cpu += "+pcid" if pcid      
-    args.delete_if { |key,value| %w[cpu_type spectre pcid].include?(key) || ForemanFogProxmox::Value.empty?(value) }
-    args.each_value { |value| value.to_i }
+    cpu += ',flags=' if spectre || pcid
+    cpu += '+spec-ctrl' if spectre
+    cpu += ';' if spectre && pcid
+    cpu += '+pcid' if pcid
+    args.delete_if { |key, value| ['cpu_type', 'spectre', 'pcid'].include?(key) || ForemanFogProxmox::Value.empty?(value) }
+    args.each_value(&:to_i)
     parsed_cpu = { cpu: cpu }.merge(args)
     logger.debug("parse_server_cpu(): #{parsed_cpu}")
     parsed_cpu
@@ -98,22 +95,24 @@ module ProxmoxServerHelper
     cdrom_image = args['cdrom_iso']
     volid = cdrom_image.empty? ? cdrom : cdrom_image
     return {} unless volid
+
     cdrom = "#{volid},media=cdrom"
-    {ide2: cdrom}
+    { ide2: cdrom }
   end
 
   def parse_server_volume(args)
     disk = {}
-    id = args['id']
-    id = "#{args['controller']}#{args['device']}" if args.has_key?('controller') && args.has_key?('device') && !id
+    volid = args['volid'] if args.key?('volid')
+    id = args['id'] if volid
+    id = "#{args['controller']}#{args['device']}" if args.key?('controller') && args.key?('device') && !id
     return args if ForemanFogProxmox::Value.empty?(id) || id == 'rootfs'
-    delete = args['_delete'].to_i == 1
-    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']) 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(:volid, args['volid']) if args.key?('volid')
+    disk.store(:storage, args['storage'].to_s) if args.key?('storage')
+    disk.store(:size, args['size'].to_i) if args.key?('size')
+    options = args.reject { |key, _value| ['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)
@@ -121,7 +120,7 @@ module ProxmoxServerHelper
 
   def parse_server_volumes(args)
     volumes = []
-    args.each_value { |value| volumes.push(parse_server_volume(value))} if args
+    args&.each_value { |value| volumes.push(parse_server_volume(value)) }
     logger.debug("parse_server_volumes(): volumes=#{volumes}")
     volumes
   end
@@ -129,13 +128,13 @@ module ProxmoxServerHelper
   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
+    interfaces_attributes&.each_value { |value| add_server_interface(value, interfaces_to_delete, interfaces_to_add) }
     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 add_server_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("add_server_interface(): id=#{id}")
@@ -156,5 +155,4 @@ module ProxmoxServerHelper
       interfaces_to_add.push(Fog::Proxmox::NicHelper.flatten(nic))
     end
   end
-
-end
+end

data/app/helpers/proxmox_vm_helper.rb

@@ -22,54 +22,51 @@ require 'fog/proxmox/helpers/nic_helper'
 require 'foreman_fog_proxmox/value'
 
 module ProxmoxVmHelper
-
   KILO = 1024
   MEGA = KILO * KILO
   GIGA = KILO * MEGA
 
-  def object_to_config_hash(vm,type)
+  def object_to_config_hash(vm)
     vm_h = ActiveSupport::HashWithIndifferentAccess.new
-    main_a = %w[hostname name vmid]
-    type = vm.config.attributes['type']
-    type = vm.type unless type
-    main = vm.attributes.select { |key,_value| main_a.include? key }
-    main_a += %w[templated]
-    config = vm.config.attributes.reject { |key,_value| main_a.include?(key) || Fog::Proxmox::DiskHelper.disk?(key) || Fog::Proxmox::NicHelper.nic?(key)  }
+    main_a = ['hostname', 'name', 'vmid']
+    main = vm.attributes.select { |key, _value| main_a.include? key }
+    main_a += ['templated']
+    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 = vm_h.merge('config_attributes': config)
     vm_h
   end
 
-  def add_cdrom_to_config_server(vm,config)
+  def add_cdrom_to_config_server(vm, config)
     cd_disks = vm.config.disks.select { |disk| disk.id == 'ide2' }
     cdrom = {}
-    disk_to_cdrom(cd_disks.first,cdrom)
+    disk_to_cdrom(cd_disks.first, cdrom)
     config = config.merge(cdrom)
     config
   end
 
-  def disk_to_cdrom(disk,cdrom)
-    volid = disk.volid  
-    cdrom_a = %w[none cdrom]  
+  def disk_to_cdrom(disk, cdrom)
+    volid = disk.volid
+    cdrom_a = ['none', 'cdrom']
     if cdrom_a.include? volid
-      cdrom.store('cdrom',volid)
+      cdrom.store('cdrom', volid)
     else
-      cdrom.store('cdrom','image')
-      cdrom.store('cdrom_iso',volid)
-      cdrom.store('cdrom_storage',disk.storage)
+      cdrom.store('cdrom', 'image')
+      cdrom.store('cdrom_iso', volid)
+      cdrom.store('cdrom_storage', disk.storage)
     end
   end
 
   def convert_sizes(args)
-    convert_memory_size(args['config_attributes'],'memory')
-    convert_memory_size(args['config_attributes'],'min_memory')
-    convert_memory_size(args['config_attributes'],'shares')
-    convert_memory_size(args['config_attributes'],'swap')
+    convert_memory_size(args['config_attributes'], 'memory')
+    convert_memory_size(args['config_attributes'], 'min_memory')
+    convert_memory_size(args['config_attributes'], 'shares')
+    convert_memory_size(args['config_attributes'], 'swap')
     args['volumes_attributes'].each_value { |value| value['size'] = (value['size'].to_i / GIGA).to_s unless ForemanFogProxmox::Value.empty?(value['size']) }
   end
 
   def remove_deletes(args)
-    args['volumes_attributes'].delete_if { |_key,value| value.has_key? '_delete' } if args['volumes_attributes']
+    args['volumes_attributes']&.delete_if { |_key, value| value.key? '_delete' }
   end
 
   def convert_memory_size(config_hash, key)
@@ -77,5 +74,4 @@ module ProxmoxVmHelper
     memory = (config_hash[key].to_i / MEGA).to_s == '0' ? config_hash[key] : (config_hash[key].to_i / MEGA).to_s
     config_hash.store(key, memory)
   end
-
-end
+end

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

@@ -18,12 +18,12 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module FogExtensions
-    module Proxmox
-        module Disk
-            extend ActiveSupport::Concern
-            def templated?
-                volid ? volid.match(/^([\w-]+)[:]base-(\d+)-disk-(\d+)/) : false
-            end
-        end
+  module Proxmox
+    module Disk
+      extend ActiveSupport::Concern
+      def templated?
+        volid ? volid.match(/^([\w-]+)[:]base-(\d+)-disk-(\d+)/) : false
+      end
     end
-end   
+  end
+end

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

@@ -18,12 +18,12 @@
 # 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
+  module Proxmox
+    module Interface
+      extend ActiveSupport::Concern
+      def mac
+        macaddr
+      end
     end
-end   
+  end
+end

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

@@ -18,27 +18,29 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module FogExtensions
-    module Proxmox
-        module Node
-            extend ActiveSupport::Concern
-            def all(options = {})
-                vms = servers.all 
-                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
+  module Proxmox
+    module Node
+      extend ActiveSupport::Concern
+      def all(_options = {})
+        vms = servers.all
+        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
+end

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

@@ -18,63 +18,75 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module FogExtensions
-    module Proxmox
-        module Server
-            extend ActiveSupport::Concern
-            attr_accessor :image_id, :templated, :ostemplate_storage, :ostemplate_file, :password
-            
-            def start
-                action('start')
-            end
-            def stop
-                action('stop')
-            end
-            def reboot
-                stop
-                start
-            end
-            def reset
-                reboot
-            end
-            def mac
-                config.mac_addresses.first
-            end
-            def memory
-                maxmem.to_i
-            end
-            def state
-                qmpstatus
-            end
-            def description
-                config.description
-            end
-            def vm_description
-                "Name=#{name}, vmid=#{vmid}"
-            end
-            def select_nic(fog_nics, nic)
-                fog_nics.find {|fog_nic| fog_nic.identity.to_s == nic.identifier}
-            end
-            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.to_s }
-            end
-            def vga
-                config.vga
-            end
-            def interfaces_attributes=(attrs); end
-            def volumes_attributes=(attrs); end
-            def config_attributes=(attrs); end
-            def templated?
-                volumes.any? { |volume| volume.templated? }
-            end
-        end
+  module Proxmox
+    module Server
+      extend ActiveSupport::Concern
+      attr_accessor :image_id, :templated, :ostemplate_storage, :ostemplate_file, :password
+
+      def start
+        action('start')
+      end
+
+      def stop
+        action('stop')
+      end
+
+      def reboot
+        stop
+        start
+      end
+
+      def reset
+        reboot
+      end
+
+      def mac
+        config.mac_addresses.first
+      end
+
+      def memory
+        maxmem.to_i
+      end
+
+      def state
+        qmpstatus
+      end
+
+      delegate :description, to: :config
+
+      def vm_description
+        "Name=#{name}, vmid=#{vmid}"
+      end
+
+      def select_nic(fog_nics, nic)
+        fog_nics.find { |fog_nic| fog_nic.identity.to_s == nic.identifier }
+      end
+
+      delegate :interfaces, to: :config
+
+      def nics
+        config.interfaces.collect(&:to_s)
+      end
+
+      def volumes
+        config.disks.reject(&:cdrom?)
+      end
+
+      def disks
+        config.disks.collect(&:to_s)
+      end
+
+      delegate :vga, to: :config
+
+      def interfaces_attributes=(attrs); end
+
+      def volumes_attributes=(attrs); end
+
+      def config_attributes=(attrs); end
+
+      def templated?
+        volumes.any?(&:templated?)
+      end
     end
-end   
+  end
+end