foreman_fog_proxmox 0.14.3 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48f67a6be462ff0c8dcbaf74676828eb72dcb028d09984e64652eabd224f5202
-  data.tar.gz: b480687763ab5d18283b40eccd8625e117a7e057517a1de268e448de3c6de428
+  metadata.gz: 7fb26099667e555c1234f7a330cf9914f6efc3c874b22cd2dbff180f1e544ebc
+  data.tar.gz: 4c7dc234f8e677f91c898cd9bb1fa52bd5d074998481aeeee7fde0c64a6ef4d5
 SHA512:
-  metadata.gz: '0608143b5b0742f00ea77306f785d6bfa0d4023f23ce1c8331c503ba7c1a87d0039bb83b5c350ca48787509e1c0aae08942d8539b2883da85539789ffdd10f9e'
-  data.tar.gz: 4f58946907839513c8bea07021a9375a81c5bfb1a8fba62c8fc9605571626e0d62e79415a08095da8f4ac42210f99770c15a8c7f123518b20df4775f70df687a
+  metadata.gz: 4c1585871bc12fd7b7d6a806dc42c1ae975e4c79765d0a753a9823a2a7c0919e3e7a5b4997217b441f98b208d025166a0ce7f25411c9b058bc874dfd2786a4cb
+  data.tar.gz: 0b6d569fb3dfb400f65caf1fedf74e03d7044a3158c98ad9daee258860b9080362431e250ddd49fa79d2e75f7a852ab0dd972029a45e54bcfc20b59eb8dacd19

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

@@ -23,18 +23,21 @@ function vmTypeSelected() {
   var host_uuid = $("input[id='host_uuid']").val();
   var new_vm =  host_uuid == undefined;
   var fieldsets = [];
+  var fieldconfig = [];
   fieldsets.push({id: 'config_advanced_options', toggle: true, new_vm: new_vm, selected: selected});
   fieldsets.push({id: 'config_ext', toggle: true, new_vm: new_vm, selected: selected});
   fieldsets.push({id: 'volume', toggle: true, new_vm: new_vm, selected: selected});
   fieldsets.push({id: 'network', toggle: true, new_vm: true, selected: selected});
-  fieldsets.push({id: 'config_options', toggle: false, new_vm: new_vm, selected: selected});
-  fieldsets.push({id: 'config_cpu', toggle: false, new_vm: new_vm, selected: selected});
-  fieldsets.push({id: 'config_memory', toggle: false, new_vm: new_vm, selected: selected});
-  fieldsets.push({id: 'config_cdrom', toggle: false, new_vm: new_vm, selected: selected});
-  fieldsets.push({id: 'config_os', toggle: false, new_vm: new_vm, selected: selected});
-  fieldsets.push({id: 'config_dns', toggle: false, new_vm: new_vm, selected: selected});
+  fieldconfig.push({id: 'config_options', new_vm: new_vm, selected: selected});
+  fieldconfig.push({id: 'config_cpu', new_vm: new_vm, selected: selected});
+  fieldconfig.push({id: 'config_memory', new_vm: new_vm, selected: selected});
+  fieldconfig.push({id: 'config_cdrom', new_vm: new_vm, selected: selected});
+  fieldconfig.push({id: 'config_os', new_vm: new_vm, selected: selected});
+  fieldconfig.push({id: 'config_dns', new_vm: new_vm, selected: selected});
   fieldsets.forEach(toggleFieldsets);
   toggleVolumes(selected);
+  fieldconfig.forEach(toggleConfigs);
+  toggleAccordions();
   return false;
 }
 
@@ -134,7 +137,7 @@ function enableFieldset(fieldsetId, fieldset) {
   input_hidden_id(fieldsetId).removeAttr('disabled');
 }
 
-function disableFieldset(fieldsetId, fieldset) {  
+function disableFieldset(fieldsetId, fieldset) {
   if (fieldset.toggle && fieldset.new_vm){
     fieldset_id(fieldsetId, fieldset).hide();
   }
@@ -142,7 +145,7 @@ function disableFieldset(fieldsetId, fieldset) {
   input_hidden_id(fieldsetId).attr('disabled','disabled');
 }
 
-function toggleFieldset(fieldsetId, fieldset, type1, type2) {  
+function toggleFieldset(fieldsetId, fieldset, type1, type2) {
   type1 === type2 ? enableFieldset(fieldsetId, fieldset) : disableFieldset(fieldsetId, fieldset);
 }
 
@@ -160,7 +163,7 @@ function fieldsets(type){
 
 function toggleFieldsets(fieldset){
   var removable_input_hidden = $("div.removable-item[style='display: none;']" + " + input:hidden");
-  removable_input_hidden.attr('disabled','disabled');  
+  removable_input_hidden.attr('disabled','disabled');
   ['qemu', 'lxc'].forEach(function(type){
     fieldsets(type).forEach(function(fieldsetId){
       toggleFieldset(fieldsetId, fieldset, fieldset.selected, type);
@@ -168,6 +171,50 @@ function toggleFieldsets(fieldset){
   });
 }
 
+function toggleAccordions() {
+  $('.accordion-content').hide();
+  $('.accordion-section').off('click').on('click', function(event) {
+    var $content = $(this).find('.accordion-content');
+    $content.slideToggle();
+    $(this).toggleClass('active');
+    $('.accordion-content').not($content).slideUp();
+    $('.accordion-section').not($(this)).removeClass('active');
+    event.stopPropagation();
+  });
+  $('.accordion-content').on('click', function(event) {
+    event.stopPropagation();
+  });
+}
+
+function enableConfig(fieldsetId, fieldset) {
+  fieldset_id(fieldsetId, fieldset).removeClass('hide');
+  fieldset_id(fieldsetId, fieldset).removeAttr('disabled');
+  input_hidden_id(fieldsetId).removeAttr('disabled');
+
+}
+
+function disableConfig(fieldsetId, fieldset) {
+  fieldset_id(fieldsetId, fieldset).addClass('hide');
+  fieldset_id(fieldsetId, fieldset).attr('disabled','disabled');
+  input_hidden_id(fieldsetId).attr('disabled','disabled');
+}
+
+function toggleConfig(fieldsetId, fieldset, type1, type2) {
+  if (type1 === type2) {
+    enableConfig(fieldsetId, fieldset);
+  } else {
+    disableConfig(fieldsetId, fieldset);
+  }
+}
+
+function toggleConfigs(fieldset){
+  ['qemu', 'lxc'].forEach(function(type){
+    fieldsets(type).forEach(function(fieldsetId){
+      toggleConfig(fieldsetId, fieldset, fieldset.selected, type);
+    });
+  });
+}
+
 function nodeSelected(item) {
   var node_id = $(item).val();
   var type = $("#host_compute_attributes_type").val();

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

@@ -32,7 +32,7 @@ function getIndex(item) {
 }
 
 function isProfile() {
-  return $(volumesAttributesSelector(true,0,'id')) !== undefined;
+  return $(volumesAttributesSelector(true,0,'id')).val() !== undefined;
 }
 
 function controllerSelected(item) {
@@ -42,23 +42,43 @@ function controllerSelected(item) {
   var profile = isProfile();
   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');
+  var device = $(device_selector).val();
   var id = controller + device;
+  validateDeviceLimit(device_selector, max);
   $(id_selector).val(id);
 }
 
 function deviceSelected(item) {
-  var device = $(item).limitedSpinner('value');
+  var device = $(item).val();
   var index = getIndex(item);
   var profile = isProfile();
   var controller_selector = volumesAttributesSelector(profile,index,'controller');
   var id_selector = volumesAttributesSelector(profile,index,'id');
   var controller = $(controller_selector).val();
   var id = controller + device;
+  var max = computeControllerMaxDevice(controller);
+  validateDeviceLimit(item, max);
   $(id_selector).val(id);
 }
 
+function validateDeviceLimit(item, maxLimit) {
+  var warningContainer = $(item).closest('form').find('.warning-container');
+  var deviceNumber = $(item).val();
+  var submitButton = $(item).closest('form').find('[data-disable-with]');
+  if (!isNaN(maxLimit) && !isNaN(deviceNumber) && deviceNumber > maxLimit) {
+    if (warningContainer.length === 0) {
+      warningContainer = $('<div class="warning-container" style="color: red;"><span style="color: red;">&#9888;</span> Warning: Value exceeds the maximum limit of ' + maxLimit + '.</div>');
+      $(item).closest('.col-md-4').append(warningContainer);
+    }
+    warningContainer.show();
+    submitButton.prop('disabled', true);
+  } else {
+    warningContainer.hide();
+    warningContainer.remove();
+    submitButton.prop('disabled', false);
+  }
+}
+
 function computeControllerMaxDevice(controller) {
   switch (controller) {
     case 'ide':
@@ -72,4 +92,4 @@ function computeControllerMaxDevice(controller) {
     default:
       return 1;
   }
-}
+}

data/app/assets/stylesheets/foreman_fog_proxmox/accordion.css

@@ -0,0 +1,21 @@
+.accordion-section {
+   cursor: pointer;
+}
+
+.accordion-section > legend::before {
+    content: "\f054";
+    font-family: "Font Awesome 5 Free";
+    position: relative;
+    left: -1em;
+    top: 50%;
+    transform: translateY(-50%);
+}
+
+.accordion-section.active > legend::before {
+    content: "\f078";
+    font-family: "Font Awesome 5 Free";
+    position: relative;
+    left: -1em;
+    top: 50%;
+    transform: translateY(-50%);
+}

data/app/helpers/proxmox_compute_resources_vms_helper.rb

@@ -41,6 +41,11 @@ module ProxmoxComputeResourcesVmsHelper
   end
 
   def vm_associate_action(vm)
+    vm_associate_link(vm, link_class: "btn btn-default")
+  end
+
+  def vm_associate_link(vm, link_class: "")
+    return unless @compute_resource.supports_host_association?
     display_link_if_authorized(
       _('Associate VM'),
       hash_for_associate_compute_resource_vm_path(
@@ -52,7 +57,7 @@ module ProxmoxComputeResourcesVmsHelper
       ),
       :title => _('Associate VM to a Foreman host'),
       :method => :put,
-      :class => 'btn btn-default'
+      :class => link_class
     )
   end
 

data/app/helpers/proxmox_vm_cloudinit_helper.rb

@@ -41,4 +41,103 @@ module ProxmoxVmCloudinitHelper
     end
     cloudinit_h
   end
+
+  def create_cloudinit_iso(vm_name, configs, ssh)
+    iso = File.join(default_iso_path, "#{vm_name.tr('.', '_')}_cloudinit.iso")
+    files = []
+    wd = create_temp_directory(ssh)
+
+    configs.each do |config|
+      config_file = ssh.run(%(echo '#{config[1]}' >> "#{wd}/#{config[0]}"))
+      unless config_file.first.status.zero?
+        delete_temp_dir(ssh, wd)
+        raise ::Foreman::Exception, "Failed to create file #{config[0]}: #{config_file.first.stdout}"
+      end
+      files.append(File.join(wd, config[0]))
+    end
+    generated_iso = ssh.run(generate_iso_command(iso, files))
+    unless generated_iso.first.status.zero?
+      delete_temp_dir(ssh, wd)
+      raise Foreman::Exception, N_("ISO build failed: #{generated_iso.first.stdout}")
+    end
+    delete_temp_dir(ssh, wd)
+    iso
+  end
+
+  def generate_iso_command(iso_file, config_files)
+    arguments = ["genisoimage", "-output #{iso_file}", '-volid', 'cidata', '-joliet', '-rock']
+    iso_command = arguments.concat(config_files).join(' ')
+    logger.debug("iso image generation args: #{iso_command}")
+    iso_command
+  end
+
+  def create_temp_directory(ssh)
+    res = ssh.run("mktemp -d")
+    raise ::Foreman::Exception, "Could not create working directory to store cloudinit config data: #{res.first.stdout}." unless res.first.status.zero?
+    res.first.stdout.chomp
+  end
+
+  def delete_temp_dir(ssh, working_dir)
+    ssh.run("rm -rf #{working_dir}")
+  rescue Foreman::Exception => e
+    logger.warn("Could not delete directory for config files: #{e}. Please delete it manually at #{working_dir}")
+  end
+
+  def parse_cloudinit_config(args)
+    filenames = ["meta-data"]
+    config_data = ["instance-id: #{args[:name]}"]
+    user_data = args.delete(:user_data)
+    return args if user_data == ''
+    check_template_format(user_data)
+    ssh = vm_ssh
+
+    if user_data.include?('#network-config') && user_data.include?('#cloud-config')
+      config_data.concat(user_data.split('#network-config'))
+      filenames.concat(['user-data', 'network-config'])
+    elsif user_data.include?('#network-config') && !user_data.include?('#cloud-config')
+      config_data.append(user_data.split('#network-config')[1])
+      filenames.append("network-config")
+    elsif !user_data.include?('#network-config') && user_data.include?('#cloud-config')
+      config_data.append(user_data)
+      filenames.append("user-data")
+    end
+
+    return args if config_data.length == 1
+    configs = filenames.zip(config_data).to_h
+
+    iso = create_cloudinit_iso(args[:name], configs, ssh)
+    args[:config_attributes]&.merge!(update_boot_order(args[:image_id]))
+    args.merge!(attach_cloudinit_iso(args[:node_id], iso))
+  end
+
+  def attach_cloudinit_iso(node, iso)
+    storage = storages(node, 'iso')[0]
+    volume = storage.volumes.detect { |v| v.volid.include? File.basename(iso) }
+    { ide2: "#{volume.volid},media=cdrom" }
+  end
+
+  def default_iso_path
+    "/var/lib/vz/template/iso"
+  end
+
+  def update_boot_order(image_id)
+    vm = find_vm_by_uuid(image_id)
+    return if vm.disks.nil?
+    disks = vm.disks.map { |disk| disk.split(":")[0] }.join(";")
+    { boot: "order=" + disks }
+  end
+
+  def vm_ssh
+    ssh = Fog::SSH.new(URI.parse(fog_credentials[:proxmox_url]).host, fog_credentials[:proxmox_username].split('@')[0], { password: fog_credentials[:proxmox_password] })
+    ssh.run('ls') # test if ssh is successful
+    ssh
+  rescue StandardError => e
+    raise ::Foreman::Exception, "Unable to ssh into proxmox server: #{e}"
+  end
+
+  def check_template_format(user_data)
+    YAML.safe_load(user_data)
+  rescue StandardError => e
+    raise ::Foreman::Exception, "'User data kind' template provided could not be loaded, please check the format: #{e}"
+  end
 end

data/app/models/foreman_fog_proxmox/proxmox.rb

@@ -181,7 +181,7 @@ module ForemanFogProxmox
        your server cannot connect to Proxmox due to network issues."
     end
 
-    def host
+    def proxmox_host
       URI.parse(url).host
     end
   end

data/app/models/foreman_fog_proxmox/proxmox_console.rb

@@ -33,7 +33,7 @@ module ForemanFogProxmox
         vnc_console = vm.start_console(options)
         vmid = extract_vmid(uuid).to_i
         vnc_host_port = vnc_console['port'].to_i + vmid
-        WsProxy.start(:host => host, :host_port => vnc_host_port, :password => vnc_console['ticket']).merge(
+        WsProxy.start(:host => proxmox_host, :host_port => vnc_host_port, :password => vnc_console['ticket']).merge(
           :name => vm.name, :type => type_console
         )
       rescue StandardError => e

data/app/models/foreman_fog_proxmox/proxmox_interfaces.rb

@@ -33,8 +33,6 @@ module ForemanFogProxmox
           _(format('Invalid proxmox NIC id on interface[%<index>s]. Must be net[n] with n integer >= 0',
             index: index))
       end
-
-      nic.identifier = nic.compute_attributes['id'] if nic.identifier.empty?
     end
 
     def vm_type(host)

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -32,10 +32,9 @@ module ForemanFogProxmox
     end
 
     def create_vm(args = {})
-      vmid = args[:vmid].to_i
       type = args[:type]
       node = client.nodes.get(args[:node_id])
-      vmid = node.servers.next_id.to_i if vmid < 1
+      vmid = args[:vmid] = assign_vmid(args[:vmid].to_i, node)
       raise ::Foreman::Exception, format(N_('invalid vmid=%<vmid>s'), vmid: vmid) unless node.servers.id_valid?(vmid)
 
       image_id = args[:image_id]
@@ -55,7 +54,12 @@ module ForemanFogProxmox
       raise e
     end
 
+    def assign_vmid(vmid, node)
+      vmid < 1 ? node.servers.next_id : vmid
+    end
+
     def compute_clone_attributes(args, container, type)
+      args = parse_cloudinit_config(args) if args[:user_data]
       parsed_args = parse_typed_vm(args, type)
       if container
         options = { :hostname => args[:name] }

data/app/views/compute_resources_vms/form/proxmox/container/_advanced.html.erb

@@ -18,14 +18,4 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% container = f.object.type == 'lxc' %>  
 
 <%= field_set_tag _("Advanced"), :id => "container_config_advanced_options", :class => ('hide' unless container) do %>
-  <%= label_tag 'show_container_config_options', n_("Main option", "Main options", 2) %>
-  <%= check_box_tag 'show_container_config_options', '1', false, :onclick => "$('#container_config_options').toggle()" %>
-  <%= label_tag 'show_container_config_cpu', _("CPU") %>
-  <%= check_box_tag 'show_container_config_cpu', '1', false, :onclick => "$('#container_config_cpu').toggle()" %>
-  <%= label_tag 'show_container_config_memory', _("Memory") %>
-  <%= check_box_tag 'show_container_config_memory', '1', false, :onclick => "$('#container_config_memory').toggle()" %>
-  <%= label_tag 'show_container_config_dns', _("DNS") %>
-  <%= check_box_tag 'show_container_config_dns', '1', false, :onclick => "$('#container_config_dns').toggle()" %>
-  <%= label_tag 'show_container_config_os', _("OS") %>
-  <%= check_box_tag 'show_container_config_os', '1', false, :onclick => "$('#container_config_os').toggle()" %>
-<% end %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/container/_config.html.erb

@@ -16,26 +16,37 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_vm_container', "data-turbolinks-track" => true %>
+<%= stylesheet_link_tag 'foreman_fog_proxmox/accordion' %>
 <% container = type == 'lxc' %>
-<%= field_set_tag n_("Main option", "Main options", 2), :id => "container_config_options", :class => 'hide', :disabled => !container do %>
+<%= field_set_tag n_("Main option", "Main options", 2), :id => "container_config_options", :class => 'accordion-section', :disabled => !container do %>
+  <div class="accordion-content">
   <%= textarea_f f, :description, :label => _('Description'), :label_size => "col-md-2" %>
   <%= checkbox_f f, :onboot, :label => _('Start at boot') %>
+  </div>
 <% end %>
-<%= field_set_tag _("CPU"), :id => "container_config_cpu", :class => 'hide', :disabled => !container do %>
+<%= field_set_tag _("CPU"), :id => "container_config_cpu", :class => 'accordion-section', :disabled => !container do %>
+  <div class="accordion-content">
   <%= select_f f, :arch, proxmox_archs_map, :id, :name, { }, :label => _('Architecture'), :label_size => "col-md-2" %>
   <%= counter_f f, :cores, :class => "input-mini", :label => _('Cores'), :label_size => "col-md-2" %>
   <%= counter_f f, :cpulimit, :class => "input-mini", :label => _('CPU limit'), :label_size => "col-md-2" %>
   <%= counter_f f, :cpuunits, :class => "input-mini", :label => _('CPU units'), :label_size => "col-md-2" %>
+  </div>
 <% end %>
-<%= field_set_tag _("Memory"), :id => "container_config_memory", :class => 'hide', :disabled => !container do %>
+<%= field_set_tag _("Memory"), :id => "container_config_memory", :class => 'accordion-section', :disabled => !container do %>
+  <div class="accordion-content">
   <%= text_f f, :memory, :class => "input-mini", :label => _('Memory (MB)'), :label_size => "col-md-2" %>
   <%= text_f f, :swap, :class => "input-mini", :label => _('Swap (MB)'), :label_size => "col-md-2" %>
+  </div>
 <% end %>
-<%= field_set_tag _("DNS"), :id => "container_config_dns", :class => 'hide', :disabled => !container do %>
+<%= field_set_tag _("DNS"), :id => "container_config_dns", :class => 'accordion-section', :disabled => !container do %>
+  <div class="accordion-content">
   <%= text_f f, :hostname, :label => _('Hostname'), :label_size => "col-md-2", :disabled => true %>
   <%= text_f f, :nameserver, :label => _('DNS server'), :label_size => "col-md-2" %>
   <%= text_f f, :searchdomain, :label => _('Search domain'), :label_size => "col-md-2" %>
+  </div>
 <% end %>
-<%= field_set_tag _("Operating System"), :id => "container_config_os", :class => 'hide', :disabled => !container do %>
+<%= field_set_tag _("Operating System"), :id => "container_config_os", :class => 'accordion-section', :disabled => !container do %>
+  <div class="accordion-content">
   <%= select_f f, :ostype, proxmox_ostypes_map, :id, :name, { }, :label => _('OS type'), :label_size => "col-md-2" %>
-<% end %>
+  </div>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb

@@ -18,12 +18,4 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% server = f.object.type == 'qemu' %>
 
 <%= field_set_tag _("Advanced"), :id => "server_config_advanced_options", :class => ('hide' unless server) do %>
-  <%= label_tag 'show_server_config_options', n_("Main option", "Main options", 2) %>
-  <%= check_box_tag 'show_server_config_options', '1', false, :onclick => "$('#server_config_options').toggle()" %>
-  <%= label_tag 'show_server_config_cpu', _("CPU") %>
-  <%= check_box_tag 'show_server_config_cpu', '1', false, :onclick => "$('#server_config_cpu').toggle()" %>
-  <%= label_tag 'show_server_config_memory', _("Memory") %>
-  <%= check_box_tag 'show_server_config_memory', '1', false, :onclick => "$('#server_config_memory').toggle()" %>
-  <%= label_tag 'show_server_config_os', _("OS") %>
-  <%= check_box_tag 'show_server_config_os', '1', false, :onclick => "$('#server_config_os').toggle()" %>
-<% end %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/server/_config.html.erb

@@ -16,11 +16,11 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_vm_server', "data-turbolinks-track" => true %>
-
+<%= stylesheet_link_tag 'foreman_fog_proxmox/accordion' %>
 <% server = type == 'qemu' %>
 <% logger.debug("_config.html.erb server_config=#{f.object.inspect}") %>
-
-<%= field_set_tag n_("Main option", "Main options", 2), :id => "server_config_options", :class => 'hide', :disabled => !server do %>
+<%= field_set_tag n_("Main option", "Main options", 2), :id => "server_config_options", :class => 'accordion-section', :disabled => !server do %>
+  <div class="accordion-content">
   <%= textarea_f f, :description, :label => _('Description'), :label_size => "col-md-2" %>
   <%= text_f f, :boot, :label => _('Boot device order'), :label_size => "col-md-2", :label_help => _('Order your devices, e.g. order=net0;ide2;scsi0. Default empty (any)')  %>
   <%= checkbox_f f, :onboot, :label => _('Start at boot') %>
@@ -29,8 +29,10 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= select_f f, :vga, proxmox_vgas_map, :id, :name, { :include_blank => true }, :label => _('VGA'), :label_size => "col-md-2" %>
   <%= select_f f, :scsihw, proxmox_scsi_controllers_map, :id, :name, { }, :label => _('SCSI Controller'), :label_size => "col-md-2" %>
   <%= select_f f, :bios, proxmox_bios_map, :id, :name, { }, :label => _('BIOS'), :label_size => "col-md-2" %>
+  </div>
 <% end %>
-<%= field_set_tag _("CPUs"), :id => "server_config_cpu", :class => 'hide', :disabled => !server do %>
+<%= field_set_tag _("CPUs"), :id => "server_config_cpu", :class => 'accordion-section', :disabled => !server do %>
+  <div class="accordion-content">
   <%= select_f f, :cpu_type, proxmox_cpus_map, :id, :name, { }, :label => _('Type'), :label_size => "col-md-2" %>
   <%= counter_f f, :sockets, :class => "input-mini", :label => _('Sockets'), :label_size => "col-md-2" %>
   <%= counter_f f, :cores, :class => "input-mini", :label => _('Cores'), :label_size => "col-md-2" %>
@@ -43,14 +45,19 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
       <%= select_f f, flag_key, proxmox_cpu_flags_map, :id, :name, { }, :label => _(flag_value) %>
     <% end %>
   <% end %>
+  </div>
 <% end %>
-<%= field_set_tag _("Memory"), :id => "server_config_memory", :class => 'hide', :disabled => !server do %>
+<%= field_set_tag _("Memory"), :id => "server_config_memory", :class => 'accordion-section', :disabled => !server do %>
+  <div class="accordion-content">
   <%= text_f f, :memory, :class => "input-mini", :label => _('Memory (MB)'), :label_size => "col-md-2" %>
   <%= text_f f, :balloon, :class => "input-mini", :label => _('Minimum memory (MB)'), :label_size => "col-md-2" %>
   <%= text_f f, :shares, :class => "input-mini", :label => _('Shares (MB)'), :label_size => "col-md-2" %>
+  </div>
 <% end %>
-<%= field_set_tag _("Operating System"), :id => "server_config_os", :class => 'hide', :disabled => !server do %>
+<%= field_set_tag _("Operating System"), :id => "server_config_os", :class => 'accordion-section', :disabled => !server do %>
+  <div class="accordion-content">
   <%= select_f f, :ostype, proxmox_operating_systems_map, :id, :name, { :include_blank => true }, :label => _('OS type'), :label_size => "col-md-2" %>
+  </div>
 <% end %>
 <%= field_set_tag _("Cloud-init"), :id => "server_config_cloud_init", :class => ('hide' unless cloudinit), :disabled => (!cloudinit) do %>
   <%= text_f f, :ciuser, :label => _('User'), :label_size => "col-md-2" %>
@@ -58,4 +65,4 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= text_f f, :searchdomain, :label => _('DNS domain'), :label_size => "col-md-2" %>
   <%= text_f f, :nameserver, :label => _('DNS servers'), :label_size => "col-md-2" %>
   <%= textarea_f f, :sshkeys, :label => _("SSH public key"), :size => "col-md-4" %>
-<% end %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/server/_volume_hard_disk.html.erb

@@ -26,7 +26,10 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= f.hidden_field :storage_type %>
     <%= select_f f, :storage, compute_resource.storages(node_id), :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2" %>
     <%= select_f f, :controller, proxmox_controllers_map, :id, :name, { }, :label => _('Controller'), :label_size => "col-md-2", :disabled => !new_volume, :onchange => 'controllerSelected(this)' %>
-    <%= text_f f, :device, :label => _('Device'), :label_size => "col-md-2", :disabled => !new_volume, :'data-min' => 0, :'data-soft-max' => proxmox_max_device(f.object.controller), :onchange => 'deviceSelected(this)' %>
+    <div>
+       <%= text_f f, :device, :label => _('Device'), :label_size => "col-md-2", :disabled => !new_volume, :onchange => 'deviceSelected(this)' %>
+    <span class="warning-container"></span>
+    </div>
     <%= select_f f, :cache, proxmox_caches_map, :id, :name, { include_blank: true }, :label => _('Cache'), :label_size => "col-md-2" %>
     <%= text_f f, :size, :class => "input-mini", :label => _("Size (GB)"), :label_size => "col-md-2", :disabled => !hard_disk %>
 <% end %>

data/app/views/compute_resources_vms/index/_proxmox.html.erb

@@ -41,6 +41,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
         <td>
         <%= action_buttons(
                 vm_power_action(vm, authorizer),
+		vm_associate_link(vm),
                 display_delete_if_authorized(hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.unique_cluster_identity(@compute_resource)).merge(:auth_object => @compute_resource, :authorizer => authorizer))) %>
         </td>
       </tr>

data/lib/foreman_fog_proxmox/version.rb

@@ -18,5 +18,5 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ForemanFogProxmox
-  VERSION = '0.14.3'
+  VERSION = '0.15.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.1
 platform: ruby
 authors:
 - Tristan Robert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-25 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -114,6 +114,7 @@ files:
 - app/assets/javascripts/foreman_fog_proxmox/proxmox_volume.js
 - app/assets/javascripts/foreman_fog_proxmox/proxmox_volume_cdrom.js
 - app/assets/javascripts/foreman_fog_proxmox/proxmox_volume_cloudinit.js
+- app/assets/stylesheets/foreman_fog_proxmox/accordion.css
 - app/controllers/concerns/foreman_fog_proxmox/compute_resources_vms_controller.rb
 - app/controllers/concerns/foreman_fog_proxmox/controller/parameters/compute_resource.rb
 - app/controllers/concerns/foreman_fog_proxmox/hosts_controller.rb
@@ -262,29 +263,29 @@ signing_key:
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files:
-- test/factories/foreman_fog_proxmox/proxmox_server_mock_factory.rb
+- test/test_plugin_helper.rb
 - test/factories/foreman_fog_proxmox/proxmox_node_mock_factory.rb
 - test/factories/foreman_fog_proxmox/proxmox_container_mock_factory.rb
+- test/factories/foreman_fog_proxmox/proxmox_server_mock_factory.rb
 - test/factories/proxmox_factory.rb
-- test/unit/foreman_fog_proxmox/proxmox_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_images_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_version_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb
-- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_test.rb
+- test/unit/foreman_fog_proxmox/semver_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_version_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
-- test/unit/foreman_fog_proxmox/semver_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_volumes_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb
 - test/functional/compute_resources_controller_test.rb
-- test/test_plugin_helper.rb