foreman_fog_proxmox 0.12.4 → 0.13.0

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

@@ -27,7 +27,7 @@ module ForemanFogProxmox
           def compute_resource_params_filter
             super.tap do |filter|
               filter.permit :ssl_verify_peer,
-                            :ssl_certs, :disable_proxy, :cr_id, :renew
+                            :ssl_certs, :disable_proxy, :auth_method, :token_id, :token
             end
           end
 

data/app/helpers/proxmox_compute_controllers_helper.rb

@@ -0,0 +1,39 @@
+# 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 ProxmoxComputeControllersHelper
+  def proxmox_controllers_map
+    proxmox_controllers_cloudinit_map << ForemanFogProxmox::OptionsSelect.new(name: 'VirtIO Block', id: 'virtio', range: 15)
+  end
+
+  def proxmox_controllers_cloudinit_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)]
+  end
+
+  def proxmox_scsi_controllers_map
+    [OpenStruct.new(id: 'lsi', name: 'LSI 53C895A (Default)'),
+     OpenStruct.new(id: 'lsi53c810', name: 'LSI 53C810'),
+     OpenStruct.new(id: 'virtio-scsi-pci', name: 'VirtIO SCSI'),
+     OpenStruct.new(id: 'virtio-scsi-single', name: 'VirtIO SCSI Single'),
+     OpenStruct.new(id: 'megasas', name: 'MegaRAID SAS 8708EM2'),
+     OpenStruct.new(id: 'pvscsi', name: 'VMware PVSCSI')]
+  end
+end

data/app/helpers/proxmox_compute_resources_helper.rb

@@ -0,0 +1,49 @@
+# 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 ProxmoxComputeResourcesHelper
+  def user_token_expiration_date(compute_resource)
+    expire = compute_resource.current_user_token_expire
+  rescue ::Foreman::Exception => e
+    return 'Has already expired. Please edit the compute resource to set a new valid one.' if e.message == 'User token expired'
+  rescue StandardError => e
+    logger.warn(format(_('failed to get identity client version: %<e>s'), e: e))
+    raise e
+  else
+    return 'Never' if expire == 0
+
+    Time.at(expire).utc
+  end
+
+  def cluster_nodes(compute_resource)
+    nodes = compute_resource.nodes ? compute_resource.nodes.collect(&:node) : []
+  rescue ::Foreman::Exception => e
+    return [] if e.message == 'User token expired'
+  rescue StandardError => e
+    logger.warn(format(_('failed to get cluster nodes: %<e>s'), e: e))
+    raise e
+  else
+    nodes
+  end
+
+  def proxmox_auth_methods_map
+    [OpenStruct.new(id: 'access_ticket', name: '(Default) Access ticket'),
+     OpenStruct.new(id: 'user_token', name: 'User token')]
+  end
+end

data/app/helpers/proxmox_compute_selectors_helper.rb

@@ -40,22 +40,6 @@ module ProxmoxComputeSelectorsHelper
      OpenStruct.new(id: 'unmanaged', name: 'Unmanaged')]
   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)]
-  end
-
-  def proxmox_scsi_controllers_map
-    [OpenStruct.new(id: 'lsi', name: 'LSI 53C895A (Default)'),
-     OpenStruct.new(id: 'lsi53c810', name: 'LSI 53C810'),
-     OpenStruct.new(id: 'virtio-scsi-pci', name: 'VirtIO SCSI'),
-     OpenStruct.new(id: 'virtio-scsi-single', name: 'VirtIO SCSI Single'),
-     OpenStruct.new(id: 'megasas', name: 'MegaRAID SAS 8708EM2'),
-     OpenStruct.new(id: 'pvscsi', name: 'VMware PVSCSI')]
-  end
-
   def proxmox_operating_systems_map
     [OpenStruct.new(id: 'other', name: 'Unspecified OS'),
      OpenStruct.new(id: 'wxp', name: 'Microsoft Windows XP'),
@@ -84,34 +68,6 @@ module ProxmoxComputeSelectorsHelper
      OpenStruct.new(id: 'serial3', name: 'Serial terminal 3')]
   end
 
-  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')]
-  end
-
   def get_controller(id)
     proxmox_controllers_map.find { |controller| controller.id == id }
   end
@@ -161,6 +117,12 @@ module ProxmoxComputeSelectorsHelper
      OpenStruct.new(id: 'host', name: 'host')]
   end
 
+  def proxmox_cpu_flags_map
+    [OpenStruct.new(id: '-1', name: 'Off'),
+     OpenStruct.new(id: '0', name: 'Default'),
+     OpenStruct.new(id: '+1', name: 'On')]
+  end
+
   def proxmox_scsihw_map
     [OpenStruct.new(id: 'lsi', name: 'lsi'),
      OpenStruct.new(id: 'lsi53c810', name: 'lsi53c810'),

data/app/helpers/proxmox_form_helper.rb

@@ -29,8 +29,7 @@ module ProxmoxFormHelper
         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')
+               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))
@@ -54,7 +53,7 @@ module ProxmoxFormHelper
     options[:form_builder_local] ||= :f
     options[:form_builder_attrs] ||= {}
 
-    content_tag(:div, :class => "#{options[:type]}_#{association}_fields_template form_template ", :style => 'display: none;') do
+    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]))
@@ -65,6 +64,15 @@ module ProxmoxFormHelper
   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)
+    hide = ''
+    hide += '$("[data-association=' + type + '_volumes]").hide();' unless ['hard_disk', 'mp'].include?(type)
+    link_to_function(name.to_s, 'add_child_node(this);tfm.numFields.initAll();' + hide, opts)
+  end
+
+  def remove_child_link_typed(name, f, type, opts = {})
+    opts[:class] = [opts[:class], 'remove_nested_fields'].compact.join(' ')
+    hide = ''
+    hide += '$("[data-association=' + type + '_volumes]").show();' unless ['hard_disk', 'mp'].include?(type)
+    f.hidden_field(opts[:method] || :_destroy) + link_to_function(name, 'remove_child_node(this);' + hide, opts)
   end
 end

data/app/{models/concerns/fog_extensions/proxmox/volume.rb → helpers/proxmox_storages_helper.rb}

@@ -17,13 +17,10 @@
 # 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 Volume
-      extend ActiveSupport::Concern
-      def templated?
-        volid ? volid.match(/^([\w-]+)[:]base-(\d+)-disk-(\d+)/) : false
-      end
-    end
+module ProxmoxStoragesHelper
+  def proxmox_storages_types_map
+    [OpenStruct.new(id: 'hard_disk', name: 'Hard disk'),
+     OpenStruct.new(id: 'cdrom', name: 'CD-ROM'),
+     OpenStruct.new(id: 'cloud_init', name: 'Cloud-init')]
   end
 end

data/app/{models/foreman_fog_proxmox/proxmox_token_expiration.rb → helpers/proxmox_vm_cdrom_helper.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2019 Tristan Robert
+# Copyright 2018 Tristan Robert
 
 # This file is part of ForemanFogProxmox.
 
@@ -11,20 +11,25 @@
 
 # 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
+# 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 ForemanFogProxmox
-  module ProxmoxTokenExpiration
-    def token_expired?
-      Fog::Proxmox.credentials_has_expired?
-    end
+require 'fog/proxmox/helpers/disk_helper'
+require 'fog/proxmox/helpers/nic_helper'
+require 'foreman_fog_proxmox/value'
+require 'foreman_fog_proxmox/hash_collection'
 
-    def token_deadline
-      Fog::Proxmox.credentials[:deadline]
-    end
+# Convert a foreman form server hash into a fog-proxmox server attributes hash
+module ProxmoxVmCdromHelper
+  def parse_server_cdrom(args)
+    cdrom_media = args['cdrom'] if args.key?('cdrom')
+    cdrom_image = args['volid'] if args.key?('volid')
+    volid = cdrom_image.empty? ? cdrom_media : cdrom_image
+    return {} unless volid
+
+    { id: 'ide2', volid: volid, media: 'cdrom' }
   end
 end

data/app/helpers/proxmox_vm_cloudinit_helper.rb

@@ -0,0 +1,43 @@
+# 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 ProxmoxVmCloudinitHelper
+  def parse_server_cloudinit(args)
+    cloudinit_h = {}
+    cloudinit = args['cloudinit']
+    unless ['none'].include? cloudinit
+      volid = args['volid']
+      storage = args['storage']
+      cloudinit_volid = volid if volid
+      cloudinit_volid ||= "#{storage}:cloudinit" if storage
+      controller = args['controller']
+      device = args['device']
+      id = "#{controller}#{device}" if controller && device
+      cloudinit_h.store(:id, id.to_sym) if id
+      cloudinit_h.store(:volid, cloudinit_volid) if cloudinit_volid
+    end
+    cloudinit_h
+  end
+end

data/app/helpers/proxmox_vm_config_helper.rb

@@ -0,0 +1,159 @@
+# 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 'fog/proxmox/helpers/cpu_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 ProxmoxVmConfigHelper
+  KILO = 1024
+  MEGA = KILO * KILO
+  GIGA = KILO * MEGA
+
+  def object_to_config_hash(vm, type)
+    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)
+    logger.debug(format(_('object_to_config_hash(%<type>s): vm_h=%<vm_h>s'), type: type, vm_h: vm_h))
+    vm_h
+  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)
+  end
+
+  def general_a
+    general_a = ['name', 'node_id', 'type', 'config_attributes', 'volumes_attributes', 'interfaces_attributes']
+    general_a += ['firmware_type', 'provision_method', 'container_volumes', 'server_volumes', 'start_after_create']
+    general_a
+  end
+
+  def config_typed_keys(type)
+    keys = { general: general_a }
+    main_a = ['name', 'type', 'node_id', 'vmid', 'interfaces', 'mount_points', 'disks']
+    case type
+    when 'lxc'
+      cpu_a = ['arch', 'cpulimit', 'cpuunits', 'cores', 'sockets']
+      memory_a = ['memory', 'swap']
+      ostemplate_a = ['ostemplate', 'ostemplate_storage', 'ostemplate_file']
+      keys.store(:ostemplate, ostemplate_a)
+    when 'qemu'
+      cpu_a = ['cpu_type', 'cpu']
+      cpu_a += ForemanFogProxmox::HashCollection.stringify_keys(Fog::Proxmox::CpuHelper.flags).keys
+      memory_a = ['memory', 'balloon', 'shares']
+      cloud_init_a = ['ciuser', 'cipassword', 'searchdomain', 'nameserver']
+      keys.store(:cloud_init, cloud_init_a)
+    end
+    keys.store(:main, main_a)
+    keys.store(:cpu, cpu_a)
+    keys.store(:memory, memory_a)
+    keys
+  end
+
+  def convert_memory_sizes(args)
+    ['memory', 'balloon', 'shares', 'swap'].each { |key| convert_memory_size(args['config_attributes'], key) }
+  end
+
+  def config_general_or_ostemplate_key?(key)
+    config_typed_keys('lxc')[:general].include?(key) || config_typed_keys(type)[:ostemplate].include?(key)
+  end
+
+  def config_a(type)
+    config_a = []
+    case type
+    when 'qemu'
+      [:cpu, :memory, :general, :cloud_init].each { |key| config_a += config_typed_keys(type)[key] }
+    when 'lxc'
+      [:main].each { |key| config_a += config_typed_keys(type)[key] }
+    end
+    config_a
+  end
+
+  def args_a(type)
+    args_a = []
+    case type
+    when 'qemu'
+      [:general].each { |key| args_a += config_typed_keys(type)[key] }
+    when 'lxc'
+      [:general, :ostemplate].each { |key| args_a += config_typed_keys(type)[key] }
+    end
+    args_a
+  end
+
+  def config_options(config, args, type)
+    options = {}
+    case type
+    when 'qemu'
+      options = config.select { |key, _value| config_typed_keys(type)[:cloud_init].include? key }
+    when 'lxc'
+      options = parse_ostemplate(args, config)
+    end
+    options
+  end
+
+  def parsed_typed_config(args, type)
+    config = args['config_attributes']
+    config ||= ForemanFogProxmox::HashCollection.new_hash_reject_keys(args, config_typed_keys(type)[:main])
+    logger.debug("parsed_typed_config(#{type}): config=#{config}")
+    config_cpu = config.select { |key, _value| config_typed_keys(type)[:cpu].include? key }
+    logger.debug("parsed_typed_config(#{type}): config_cpu=#{config_cpu}")
+    cpu = parse_typed_cpu(config_cpu, type)
+    memory = parse_typed_memory(config.select { |key, _value| config_typed_keys(type)[:memory].include? key }, type)
+    parsed_config = config.reject { |key, value| config_a(type).include?(key) || ForemanFogProxmox::Value.empty?(value) }
+    parsed_vm = args.reject { |key, value| args_a(type).include?(key) || ForemanFogProxmox::Value.empty?(value) }
+    parsed_vm = parsed_vm.merge(config_options(config, args, type))
+    parsed_vm = parsed_vm.merge(parsed_config).merge(cpu).merge(memory)
+    logger.debug("parsed_typed_config(#{type}): parsed_vm=#{parsed_vm}")
+    parsed_vm
+  end
+
+  def parse_typed_memory(args, type)
+    memory = {}
+    ForemanFogProxmox::HashCollection.remove_empty_values(args)
+    config_typed_keys(type)[:memory].each { |key| ForemanFogProxmox::HashCollection.add_and_format_element(memory, key.to_sym, args, key, :to_i) }
+    memory
+  end
+
+  def parse_typed_cpu(args, type)
+    cpu = {}
+    ForemanFogProxmox::HashCollection.remove_empty_values(args)
+    if type == 'qemu'
+      logger.debug("parse_typed_cpu(#{type}): args=#{args}")
+      cpu_flattened = Fog::Proxmox::CpuHelper.flatten(args)
+      cpu_flattened = args[:cpu] if cpu_flattened.empty?
+      logger.debug("parse_typed_cpu(#{type}): cpu_flattened=#{cpu_flattened}")
+      ForemanFogProxmox::HashCollection.remove_empty_values(args)
+      ForemanFogProxmox::HashCollection.remove_keys(args, config_typed_keys('qemu')[:cpu])
+      args.each_value(&:to_i)
+      cpu = { cpu: cpu_flattened }
+    end
+    config_typed_keys('lxc')[:cpu].each { |key| ForemanFogProxmox::HashCollection.add_and_format_element(cpu, key.to_sym, args, key) } if type == 'lxc'
+    logger.debug("parse_typed_cpu(#{type}): cpu=#{cpu}")
+    cpu
+  end
+end