foreman_fog_proxmox 0.12.4 → 0.13.0

data/app/helpers/proxmox_vm_helper.rb

@@ -22,67 +22,29 @@ 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)
-    vm_h = ActiveSupport::HashWithIndifferentAccess.new
-    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
-  end
-
-  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)
-    config = config.merge(cdrom)
-    config
-  end
-
-  def disk_to_cdrom(disk, cdrom)
-    volid = disk.volid
-    cdrom_a = ['none', 'cdrom']
-    if cdrom_a.include? volid
-      cdrom.store('cdrom', volid)
-    else
-      cdrom.store('cdrom', 'image')
-      cdrom.store('cdrom_iso', volid)
-      cdrom.store('cdrom_storage', disk.storage)
-    end
-  end
-
-  def convert_memory_sizes(args)
-    convert_memory_size(args['config_attributes'], 'memory')
-    convert_memory_size(args['config_attributes'], 'balloon')
-    convert_memory_size(args['config_attributes'], 'shares')
-    convert_memory_size(args['config_attributes'], 'swap')
-  end
-
-  def convert_volumes_size(args)
-    args['volumes_attributes'].each_value { |value| value['size'] = (value['size'].to_i / GIGA).to_s unless ForemanFogProxmox::Value.empty?(value['size']) }
-  end
-
-  def convert_sizes(args)
-    convert_memory_size(args['config_attributes'], 'memory')
-    convert_memory_size(args['config_attributes'], 'balloon')
-    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.key? '_delete' }
-  end
-
-  def convert_memory_size(config_hash, key)
-    # default unit memory size is Mb
-    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)
+  include ProxmoxVmInterfacesHelper
+  include ProxmoxVmVolumesHelper
+  include ProxmoxVmConfigHelper
+  include ProxmoxVmOsTemplateHelper
+
+  def vm_collection(type)
+    collection = :servers
+    collection = :containers if type == 'lxc'
+    collection
+  end
+
+  # Convert a foreman form server/container vm hash into a fog-proxmox server/container attributes hash
+  def parse_typed_vm(args, type)
+    args = ActiveSupport::HashWithIndifferentAccess.new(args)
+    return {} unless args
+    return {} if args.empty?
+    return {} unless args['type'] == type
+
+    logger.debug("parse_typed_vm(#{type}): args=#{args}")
+    parsed_vm = parsed_typed_config(args, type)
+    parsed_vm = parsed_typed_interfaces(args, type, parsed_vm)
+    parsed_vm = parsed_typed_volumes(args, type, parsed_vm)
+    logger.debug("parse_typed_vm(#{type}): parsed_vm=#{parsed_vm}")
+    parsed_vm
   end
 end

data/app/helpers/proxmox_vm_interfaces_helper.rb

@@ -0,0 +1,85 @@
+# 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/>.
+
+require 'fog/proxmox/helpers/disk_helper'
+require 'fog/proxmox/helpers/nic_helper'
+require 'foreman_fog_proxmox/value'
+require 'foreman_fog_proxmox/hash_collection'
+
+# Convert a foreman form server hash into a fog-proxmox server attributes hash
+module ProxmoxVmInterfacesHelper
+  def parsed_typed_interfaces(args, type, parsed_vm)
+    interfaces_to_add, interfaces_to_delete = parse_typed_interfaces(args, type)
+    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?
+    parsed_vm
+  end
+
+  def parse_typed_interfaces(args, type)
+    interfaces_to_add = []
+    interfaces_to_delete = []
+    interfaces_attributes = args['interfaces_attributes']
+    interfaces_attributes ||= args['config_attributes']['interfaces_attributes'] unless ForemanFogProxmox::Value.empty?(args['config_attributes'])
+    interfaces_attributes&.each_value { |value| add_or_delete_typed_interface(value, interfaces_to_delete, interfaces_to_add, type) }
+    [interfaces_to_add, interfaces_to_delete]
+  end
+
+  def interface_compute_attributes_typed_keys(type)
+    keys = ['rate', 'bridge', 'tag']
+    case type
+    when 'qemu'
+      keys += ['model', 'firewall', 'link_down', 'queues']
+    when 'lxc'
+      keys += ['name', 'ip', 'ip6', 'gw', 'gw6', 'dhcp', 'dhcp6', 'cidr', 'cidr6', 'firewall']
+    end
+    keys
+  end
+
+  def interface_common_typed_keys(type)
+    [{ origin: 'id', dest: 'id' }, { origin: 'mac', dest: type == 'qemu' ? 'macaddr' : 'hwaddr' }]
+  end
+
+  def compute_dhcps(interface_attributes_h)
+    interface_attributes_h[:dhcp] = interface_attributes_h[:ip] == 'dhcp' ? '1' : '0'
+    interface_attributes_h[:ip] = '' if interface_attributes_h[:dhcp] == '1'
+    interface_attributes_h[:dhcp6] = interface_attributes_h[:ip6] == 'dhcp' ? '1' : '0'
+    interface_attributes_h[:ip6] = '' if interface_attributes_h[:dhcp6] == '1'
+  end
+
+  def add_or_delete_typed_interface(interface_attributes, interfaces_to_delete, interfaces_to_add, type)
+    logger.debug("add_or_delete_typed_interface(#{type}): interface_attributes=#{interface_attributes}")
+    ForemanFogProxmox::HashCollection.remove_empty_values(interface_attributes)
+    ForemanFogProxmox::HashCollection.remove_empty_values(interface_attributes['compute_attributes']) if interface_attributes['compute_attributes']
+    nic = {}
+    id = interface_attributes['id']
+    delete = interface_attributes['_delete'].to_i == 1
+    if delete
+      logger.debug("add_or_delete_typed_interface(#{type}): delete id=#{id}")
+      interfaces_to_delete.push(id.to_s)
+    else
+      interface_common_typed_keys(type).each { |key| ForemanFogProxmox::HashCollection.add_and_format_element(nic, key[:dest].to_sym, interface_attributes, key[:origin]) }
+      interface_attributes_h = interface_attributes['compute_attributes']
+      interface_attributes_h ||= interface_attributes if ForemanFogProxmox::Value.empty?(interface_attributes['compute_attributes'])
+      interface_compute_attributes_typed_keys(type).each { |key| ForemanFogProxmox::HashCollection.add_and_format_element(nic, key.to_sym, interface_attributes_h, key) }
+      compute_dhcps(interface_attributes_h)
+      logger.debug("add_or_delete_typed_interface(#{type}): add nic=#{nic}")
+      interfaces_to_add.push(Fog::Proxmox::NicHelper.flatten(nic))
+    end
+  end
+end

data/app/helpers/proxmox_vm_os_template_helper.rb

@@ -0,0 +1,47 @@
+# 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/>.
+
+require 'fog/proxmox/helpers/disk_helper'
+require 'fog/proxmox/helpers/nic_helper'
+require 'foreman_fog_proxmox/value'
+require 'foreman_fog_proxmox/hash_collection'
+
+module ProxmoxVmOsTemplateHelper
+  def ostemplate_keys
+    ['ostemplate_storage', 'ostemplate_file']
+  end
+
+  def parse_ostemplate_without_keys(args)
+    parse_container_ostemplate(args.select { |key, _value| ostemplate_keys.include? key })
+  end
+
+  def parse_ostemplate(args, config)
+    ostemplate = parse_ostemplate_without_keys(args)
+    ostemplate = parse_ostemplate_without_keys(config) unless ostemplate[:ostemplate]
+    ostemplate
+  end
+
+  def parse_container_ostemplate(args)
+    ostemplate = args['ostemplate']
+    ostemplate_file = args['ostemplate_file']
+    ostemplate ||= ostemplate_file
+    parsed_ostemplate = { ostemplate: ostemplate }
+    parsed_ostemplate
+  end
+end

data/app/helpers/proxmox_vm_volumes_helper.rb

@@ -0,0 +1,105 @@
+# 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/>.
+
+require 'fog/proxmox/helpers/disk_helper'
+require 'fog/proxmox/helpers/nic_helper'
+require 'foreman_fog_proxmox/value'
+require 'foreman_fog_proxmox/hash_collection'
+
+# Convert a foreman form server hash into a fog-proxmox server attributes hash
+module ProxmoxVmVolumesHelper
+  include ProxmoxVmCdromHelper
+  include ProxmoxVmCloudinitHelper
+  KILO = 1024
+  MEGA = KILO * KILO
+  GIGA = KILO * MEGA
+
+  def add_disk_options(disk, args)
+    options = ForemanFogProxmox::HashCollection.new_hash_reject_keys(args, ['id', 'volid', 'controller', 'device', 'storage', 'size', '_delete', 'storage_type'])
+    ForemanFogProxmox::HashCollection.remove_empty_values(options)
+    disk[:options] = options
+  end
+
+  def parsed_typed_volumes(args, type, parsed_vm)
+    logger.debug(format(_('parsed_typed_volumes(%<type>s): args=%<args>s'), args: args, type: type))
+    volumes_attributes = args['volumes_attributes']
+    volumes_attributes ||= args['config_attributes']['volumes_attributes'] unless ForemanFogProxmox::Value.empty?(args['config_attributes'])
+    volumes_attributes ||= args['vm_attrs']['volumes_attributes'] unless ForemanFogProxmox::Value.empty?(args['vm_attrs'])
+    volumes = parse_typed_volumes(volumes_attributes, type)
+    volumes.each { |volume| parsed_vm = parsed_vm.merge(volume) }
+    parsed_vm
+  end
+
+  def parse_hard_disk_volume(args)
+    disk = {}
+    disk[:id] = args['id'] if args.key?('id')
+    disk[:volid] = args['volid'] if args.key?('volid')
+    disk[:storage] = args['storage'].to_s if args.key?('storage')
+    disk[:size] = args['size'].to_i if args.key?('size')
+    add_disk_options(disk, args)
+    disk.key?(:storage) ? disk : {}
+  end
+
+  def volume_type?(args, type)
+    if args.key?('storage_type')
+      args['storage_type'] == type
+    else
+      Fog::Proxmox::DiskHelper.cloud_init?(args['volid']) if type == 'cloud_init'
+      Fog::Proxmox::DiskHelper.cdrom?(args['volid']) if type == 'cdrom'
+      Fog::Proxmox::DiskHelper.disk?(args['id']) if ['hard_disk', 'rootfs', 'mp'].include?(type)
+    end
+  end
+
+  def parse_typed_volume(args, type)
+    logger.debug(format(_('parse_typed_volume(%<type>s): args=%<args>s'), args: args, type: type))
+    disk = parse_hard_disk_volume(args) if volume_type?(args, 'hard_disk') || volume_type?(args, 'mp') || volume_type?(args, 'rootfs')
+    disk = parse_server_cloudinit(args) if volume_type?(args, 'cloud_init')
+    disk = parse_server_cdrom(args) if volume_type?(args, 'cdrom')
+    logger.debug(format(_('parse_typed_volume(%<type>s): disk=%<disk>s'), disk: disk, type: type))
+    Fog::Proxmox::DiskHelper.flatten(disk) unless disk.empty?
+  end
+
+  def add_typed_volume(volumes, value, type)
+    volume = parse_typed_volume(value, type)
+    volumes.push(volume) unless ForemanFogProxmox::Value.empty?(volume)
+  end
+
+  def parse_typed_volumes(args, type)
+    logger.debug(format(_('parse_typed_volumes(%<type>s): args=%<args>s'), args: args, type: type))
+    volumes = []
+    args&.each_value { |value| add_typed_volume(volumes, value, type) }
+    volumes
+  end
+
+  def convert_volumes_size(args)
+    args['volumes_attributes'].each_value { |value| value['size'] = (value['size'].to_i / GIGA).to_s unless ForemanFogProxmox::Value.empty?(value['size']) }
+  end
+
+  def convert_sizes(args)
+    convert_memory_size(args['config_attributes'], 'memory')
+    convert_memory_size(args['config_attributes'], 'balloon')
+    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_volume_keys(args)
+    args['volumes_attributes'].each_value { |volume_attributes| ForemanFogProxmox::HashCollection.remove_keys(volume_attributes, ['_delete']) } if args.key?('volumes_attributes')
+  end
+end

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

@@ -21,8 +21,23 @@ module FogExtensions
   module Proxmox
     module Disk
       extend ActiveSupport::Concern
-      def templated?
-        volid ? volid.match(/^([\w-]+)[:]base-(\d+)-disk-(\d+)/) : false
+
+      attr_accessor :ciuser, :cipassword, :searchdomain, :nameserver, :sshkeys
+
+      def storage_type
+        return 'cdrom' if cdrom?
+
+        cloud_init? ? 'cloud_init' : 'hard_disk'
+      end
+
+      def cdrom
+        return 'none' unless cdrom? || volid.nil?
+
+        ['none', 'cdrom'].include?(volid) ? volid : 'image'
+      end
+
+      def cloudinit
+        cloud_init? ? 'disk' : 'none'
       end
     end
   end

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

@@ -23,17 +23,32 @@ module FogExtensions
   module Proxmox
     module Interface
       extend ActiveSupport::Concern
-      attr_accessor :dhcpv4, :dhcpv6, :gwv4, :gwv6
       def mac
         macaddr
       end
 
-      def cidrv4_prefix
+      def dhcp
+        ip == 'dhcp'
+      end
+
+      def dhcp6
+        ip6 == 'dhcp'
+      end
+
+      def dhcp=(value)
+        @dhcp = value
+      end
+
+      def dhcp6=(value)
+        @dhcp6 = value
+      end
+
+      def cidr
         Fog::Proxmox::IpHelper.prefix(ip) if ip
       end
 
-      def cidrv6_prefix
-        Fog::Proxmox::IpHelper.prefix6(ip) if ip
+      def cidr6
+        Fog::Proxmox::IpHelper.prefix6(ip6) if ip6
       end
     end
   end

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

@@ -55,7 +55,7 @@ module FogExtensions
       delegate :description, to: :config
 
       def vm_description
-        "Name=#{name}, vmid=#{vmid}"
+        format(_('Type %<type>s, node %<node>s, %<cpus>s CPUs and %<memory>s MB memory'), type: type, node: node_id, cpus: config.cores || '0', memory: config.memory / (1024 * 1024) || '0')
       end
 
       def select_nic(fog_nics, nic)
@@ -69,7 +69,7 @@ module FogExtensions
       end
 
       def volumes
-        config.disks.reject(&:cdrom?)
+        config.disks
       end
 
       def disks
@@ -78,6 +78,7 @@ module FogExtensions
 
       delegate :vga, to: :config
       delegate :pool, to: :config
+      delegate :cloud_init?, to: :config
 
       def interfaces_attributes=(attrs); end
 
@@ -86,7 +87,11 @@ module FogExtensions
       def config_attributes=(attrs); end
 
       def templated?
-        volumes.any?(&:templated?)
+        volumes.any?(&:template?)
+      end
+
+      def cdrom?
+        volumes.any?(&:cdrom?)
       end
     end
   end

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

@@ -24,38 +24,12 @@ module FogExtensions
     module ServerConfig
       extend ActiveSupport::Concern
       def cpu_type
-        Fog::Proxmox::CpuHelper.extract_type(cpu)
+        Fog::Proxmox::CpuHelper.extract_cputype(cpu)
       end
 
-      def spectre
-        Fog::Proxmox::CpuHelper.has_spectre?(cpu)
-      end
-
-      def pcid
-        Fog::Proxmox::CpuHelper.has_pcid?(cpu)
-      end
-
-      def cdrom
-        if disks.cdrom
-          ['none', 'cdrom'].include?(disks.cdrom.volid) ? disks.cdrom.volid : 'image'
-        else
-          'none'
-        end
-      end
-
-      def cdrom_storage
-        disks.cdrom ? disks.cdrom.storage : ''
-      end
-
-      def cdrom_iso
-        disks.cdrom ? disks.cdrom.volid : ''
-      end
-
-      def cdrom_image
-        if disks.cdrom
-          ['none', 'cdrom'].include?(disks.cdrom.volid) ? disks.cdrom.volid : 'image'
-        else
-          'none'
+      Fog::Proxmox::CpuHelper.flags.each do |flag_key, flag_value|
+        define_method(flag_key) do
+          Fog::Proxmox::CpuHelper.flag_value(cpu, flag_value)
         end
       end
 
@@ -66,6 +40,10 @@ module FogExtensions
       def rootfs_file
         disks.rootfs&.volid
       end
+
+      def cloud_init?
+        disks.any?(&:cloud_init?)
+      end
     end
   end
 end