foreman_fog_proxmox 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3332c6939c4896c597786242fb2d0a96ff206e9b4503ae540d25bc26aa46dd
-  data.tar.gz: c8c9d2808b64625cfd21dee603267df85168cfec2c199b12f60b841c40cef1c6
+  metadata.gz: ca619ec359deaafb7ae8d9226bd0db7213a8f8276b27c24e39d3f4549744d759
+  data.tar.gz: 674603da5a60bf493462eaff2f9ac55637b908ee557cb2d026cdba006f17d1df
 SHA512:
-  metadata.gz: f3be1549ae1d6dc713bdd8f55f14e4d72fdb8bb2f282714a4fdc2eea02a1a1439f2fb0ef1bf9b84e551c09065f2ddee5333f994ace60cb2ae4a2ee5cb096bea7
-  data.tar.gz: d70a4df6f3f87a0ab9b552c2d481ced3c971a01cfa6c28d826cb786e5dd6a7794e2af0ee6ae7bfeef7403be2d6c66f38afd51f44db0185f40168be40f1de4041
+  metadata.gz: a5bc188c202ac4c0a067c001949ae64666c914000a2d2eff3bd49554f0be033bc5b5bcafddcfa9aeaebc9f282c7d0908237c3dfed801bbd8109fa7a5f79a757f
+  data.tar.gz: 044cc2a7d66fb8cddb3332d0fe98160e77a6bb0a71aec979334692197e4e406d2866bb84c8e1dde032797541c96f267a3126024e9520d28f87ceb0eb4f09a4a3

data/README.md

@@ -17,7 +17,7 @@ If you like it and need more features you can [support](SUPPORT.md) it.
 Tested with:
 
 * Foreman >= 1.17 and < 1.20
-* Fog-proxmox >= 0.5.2
+* Fog-proxmox >= 0.5.3
 * Proxmox >= 5.1
 * Ruby >= 2.3
 
@@ -101,9 +101,9 @@ Please see the Foreman manual for complete instructions:
 
 ### Prerequisites
 
-You need a Proxmox VE >= 5.1 server running.
-
-You also need nodejs in your dev machine to run webpack-dev-server.
+* You need a Proxmox VE >= 5.1 server running.
+* You need ruby >= 2.3. You can install it with [rbenv](https://github.com/rbenv/rbenv).
+* You also need nodejs in your dev machine to run webpack-dev-server. You can install it with [nvm](https://github.com/creationix/nvm).
 
 ### Platform
 
@@ -121,18 +121,22 @@ git checkout tags/1.17.3
 
 ```ruby
 gem 'foreman_fog_proxmox', :path => '/your_path_to/foreman_fog_proxmox'
+gem 'fog-proxmox', :path => '/your_path_to/fog-proxmox' # optional if you need to modify fog-proxmox code too
+gem 'ruby-debug-ide' # dev
+gem 'debase' # dev
+gem 'simplecov' # test
 ```
 
 * In foreman directory, install dependencies:
 
 ```shell
-bundle install
+bundle install --without libvirt postgresql mysql2
 ```
 
 * Configure foreman settings:
 
 ```shell
-cp config/settings.yaml.example config/settings.yaml
+cp config/settings.yaml.test config/settings.yaml
 ```
 
 * Install foreman database (sqlite is default in rails development):

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

@@ -50,21 +50,26 @@ function toggleVolumes(selected){
       div_server.show();
       a_container.hide();
       a_server.show();
-    break;
+      break;
     case 'lxc':
       div_container.show();
       div_server.hide();
       a_container.show();
       a_server.hide();
-    break;
+      break;
+    default:
+      console.log("unkown type="+selected);
+      break;
   }
 }
 
 function toggleFieldset(fieldset, index, fieldsets){
-  var server_input_hidden = $("div[id^='server_volumes']" + " > input:hidden");
-  var container_input_hidden = $("div[id^='container_volumes']" + " > input:hidden");
+  var server_input_hidden = $("div[id^='server_volumes']" + " + input:hidden");
+  var container_input_hidden = $("div[id^='container_volumes']" + " + input:hidden");
+  var removable_input_hidden = $("div.removable-item[style='display: none;']" + " + input:hidden");
   var server_fieldset = $("fieldset[id^='server_"+fieldset.id+"']");
   var container_fieldset = $("fieldset[id^='container_"+fieldset.id+"']");
+  removable_input_hidden.attr('disabled','disabled');
   switch (fieldset.selected) {
     case 'qemu':
       if (fieldset.toggle && fieldset.new_vm){
@@ -87,6 +92,7 @@ function toggleFieldset(fieldset, index, fieldsets){
       server_input_hidden.attr('disabled','disabled');
       break;
     default:
+      console.log("unkown type="+fieldset.selected);
       break;
   }
 }

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

@@ -41,75 +41,90 @@ function cdromSelected(item) {
   return false;
 }
 
-function initCdromStorage(){
+function initCdromStorage() {
   var select = '#host_compute_attributes_config_attributes_cdrom_storage';
-  $(select + ' option:selected').prop('selected',false);
+  $(select + ' option:selected').prop('selected', false);
   $(select).val('');
 }
 
-function initCdromOptions(name){
-  var select = '#host_compute_attributes_config_attributes_cdrom_'+name;
+function initCdromOptions(name) {
+  var select = '#host_compute_attributes_config_attributes_cdrom_' + name;
   $(select).empty();
   $(select).append($("<option></option>").val('').text(''));
   $(select).val('');
 }
 
-  function storageIsoSelected(item) {
-    var storage = $(item).val();
-    if (storage != '') {
-      tfm.tools.showSpinner();
-      $.getJSON({
-        type: 'get',
-        url: '/foreman_fog_proxmox/isos/'+storage,
-        complete: function(){
-          tfm.tools.hideSpinner();
-        },
-        error: function(j,status,error){
-          console.log("Error=" + error +", status=" + status + " loading isos for storage=" + storage);
-        },
-        success: function(isos) {
-          initCdromOptions('iso');
-          $.each(isos, function(i,iso){
-            $('#host_compute_attributes_config_attributes_cdrom_iso').append($("<option></option>").val(iso.volid).text(iso.volid));
-          });
-        }
-      });
-    } else {
-      initCdromOptions('iso');
-    }
+function storageIsoSelected(item) {
+  var storage = $(item).val();
+  if (storage != '') {
+    tfm.tools.showSpinner();
+    $.getJSON({
+      type: 'get',
+      url: '/foreman_fog_proxmox/isos/' + storage,
+      complete: function () {
+        tfm.tools.hideSpinner();
+      },
+      error: function (j, status, error) {
+        console.log("Error=" + error + ", status=" + status + " loading isos for storage=" + storage);
+      },
+      success: function (isos) {
+        initCdromOptions('iso');
+        $.each(isos, function (i, iso) {
+          $('#host_compute_attributes_config_attributes_cdrom_iso').append($("<option></option>").val(iso.volid).text(iso.volid));
+        });
+      }
+    });
+  } else {
+    initCdromOptions('iso');
   }
+}
 
-function controllerSelected(item){
+function controllerSelected(item) {
   var controller = $(item).val();
-  var id = $(item).attr('id');
-  var pattern = /(\w+)(\d+)(\w+)/i;
-  var index =  pattern.exec(id)[2];
+  var index = getIndex(item);
   var max = computeControllerMaxDevice(controller);
-  $('#host_compute_attributes_volumes_attributes_' + index + '_device').attr('data-soft-max',max);
+  var device_selector = '#host_compute_attributes_volumes_attributes_' + index + '_device';
+  $(device_selector).attr('data-soft-max', max);
+  var device = $(device_selector).limitedSpinner('value');
+  $('#host_compute_attributes_volumes_attributes_' + index + '_id').val(controller + device);
   tfm.numFields.initAll();
 }
 
-function computeControllerMaxDevice(controller){
+function deviceSelected(item) {
+  var device = $(item).limitedSpinner('value');
+  console.log("device=" + device);
+  var index = getIndex(item);
+  var controller_selector = '#host_compute_attributes_volumes_attributes_' + index + '_controller';
+  var controller = $(controller_selector).val();
+  $('#host_compute_attributes_volumes_attributes_' + index + '_id').val(controller + device);
+  tfm.numFields.initAll();
+}
+
+function getIndex(item) {
+  var id = $(item).attr('id');
+  var pattern = /(host_compute_attributes_volumes_attributes_)(\d+)[_](.*)/i;
+  pattern_a = pattern.exec(id);
+  var index = pattern_a[2];
+  console.log("index=" + index);
+  return index;
+}
+
+function computeControllerMaxDevice(controller) {
   switch (controller) {
     case 'ide':
       return 3;
-      break;
     case 'sata':
       return 5;
-      break;
     case 'scsi':
       return 13;
-      break;
     case 'virtio':
       return 15;
-      break;
     default:
       return 1;
-      break;
   }
 }
 
-function balloonSelected(item){
+function balloonSelected(item) {
   var ballooned = $(item).is(':checked');
   var memory_f = $("input[name$='[config_attributes][memory]']:hidden");
   var min_memory_f = $("input[id$='config_attributes_min_memory']");
@@ -120,13 +135,13 @@ function balloonSelected(item){
     min_memory_f.removeAttr('disabled');
     shares_f.removeAttr('disabled');
     var max = memory_f.val();
-    console.log("max="+max);
-    min_memory_f.attr('data-soft-max',max);
+    console.log("max=" + max);
+    min_memory_f.attr('data-soft-max', max);
   } else {
-    min_memory_f.attr('disabled','disabled');
-    min_memory_hidden_f.attr('value','');
-    shares_f.attr('disabled','disabled');
-    shares_hidden_f.attr('value','');
+    min_memory_f.attr('disabled', 'disabled');
+    min_memory_hidden_f.attr('value', '');
+    shares_f.attr('disabled', 'disabled');
+    shares_hidden_f.attr('value', '');
   }
   tfm.numFields.initAll();
 }

data/app/helpers/proxmox_container_helper.rb

@@ -96,9 +96,10 @@ module ProxmoxContainerHelper
   def parse_container_volume(args)
     disk = {}
     id = args['id']
-    id = "mp#{args['device']}" unless id
+    id = "mp#{args['device']}" if args.has_key?('device') && !id
     delete = args['_delete'].to_i == 1
     logger.debug("parse_container_volume() args=#{args}")
+    return args if ForemanFogProxmox::Value.empty?(id) || server_disk?(id)
     args.delete_if { |_key,value| ForemanFogProxmox::Value.empty?(value) }
     if delete
       logger.debug("parse_container_volume(): delete id=#{id}")

data/app/helpers/proxmox_form_helper.rb

@@ -46,22 +46,27 @@ end
     pass = obj.attributes.has_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] ||= {}
 
-  def second_child_fields_template(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, :id => "#{options[:type]}_#{association}", :style => 'display: none') do
-      form_builder.fields_for(association, options[:object], :child_index => "0") do |f|
-        render(:partial => options[:partial], :layout => options[:layout],
-               :locals => { options[:form_builder_local] => f }.merge(options[:form_builder_attrs]))
-      end
+  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
 
+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

data/app/helpers/proxmox_server_helper.rb

@@ -103,8 +103,8 @@ module ProxmoxServerHelper
   def parse_server_volume(args)
     disk = {}
     id = args['id']
-    id = "#{args['controller']}#{args['device']}" unless id
-    return args if ForemanFogProxmox::Value.empty?(id)
+    id = "#{args['controller']}#{args['device']}" if args.has_key?('controller') && args.has_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) }
     if delete
@@ -113,9 +113,9 @@ module ProxmoxServerHelper
       disk
     else
       disk.store(:id, id)
-      disk.store(:volid, args['volid'])
-      disk.store(:storage, args['storage'].to_s)
-      disk.store(:size, args['size'].to_i)
+      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(:options, options)
       logger.debug("parse_server_volume(): add disk=#{disk}")

data/app/helpers/proxmox_vm_helper.rb

@@ -70,6 +70,10 @@ module ProxmoxVmHelper
     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' }
+  end
+
   def convert_memory_size(config_hash, key)
     config_hash.store(key, (config_hash[key].to_i / MEGA).to_s) unless ForemanFogProxmox::Value.empty?(config_hash[key])
   end
@@ -83,4 +87,12 @@ module ProxmoxVmHelper
     return type, vmid
   end
 
+  def mount_point_disk?(id)
+    /^(mp)(\d+)$/.match?(id)
+  end
+
+  def server_disk?(id)
+    /^(scsi|sata|virtio|ide)(\d+)$/.match?(id)
+  end
+
 end

data/app/models/foreman_fog_proxmox/proxmox.rb

@@ -120,8 +120,13 @@ module ForemanFogProxmox
 
     def host_interfaces_attrs(host)
       host.interfaces.select(&:physical?).each.with_index.reduce({}) do |hash, (nic, index)|
-        raise ::Foreman::Exception.new _("Identifier interface[%{index}] required." % { index: index }) if nic.identifier.empty?
+        # Set default interface identifier to net[n]
+        nic.identifier = "net%{index}" % {index: index} if nic.identifier.empty?
         raise ::Foreman::Exception.new _("Invalid identifier interface[%{index}]. Must be net[n] with n integer >= 0" % { index: index }) unless Fog::Proxmox::NicHelper.valid?(nic.identifier)
+        # Set default container interface name to eth[n]
+        container = host.compute_attributes['type'] == 'lxc'
+        nic.compute_attributes['name'] = "eth%{index}" % {index: index} if container && nic.compute_attributes['name'].empty?
+        raise ::Foreman::Exception.new _("Invalid name interface[%{index}]. Must be eth[n] with n integer >= 0" % { index: index }) if container && !/^(eth)(\d+)$/.match?(nic.compute_attributes['name'])
         nic_compute_attributes = nic.compute_attributes.merge(id: nic.identifier)
         nic_compute_attributes.store(:ip, nic.ip) if (nic.ip && !nic.ip.empty?)
         nic_compute_attributes.store(:ip6, nic.ip6) if (nic.ip6 && !nic.ip6.empty?)
@@ -232,6 +237,7 @@ module ForemanFogProxmox
       else
         logger.debug(_("create_vm(): %{args}") % { args: args })
         convert_sizes(args)
+        remove_deletes(args)
         case type
           when 'qemu'
             node.servers.create(parse_server_vm(args))
@@ -422,7 +428,7 @@ module ForemanFogProxmox
         cpu: 'kvm64',
         scsihw: 'virtio-scsi-pci',
         ide2: "none,media=cdrom",
-        templated: 0).merge(Fog::Proxmox::DiskHelper.flatten(volume_server_defaults)).merge(Fog::Proxmox::NicHelper.flatten(interface_server_defaults))
+        templated: 0).merge(Fog::Proxmox::DiskHelper.flatten(volume_server_defaults)).merge(Fog::Proxmox::DiskHelper.flatten(volume_container_defaults)).merge(Fog::Proxmox::NicHelper.flatten(interface_server_defaults))
     end
 
     def vm_container_instance_defaults
@@ -432,7 +438,7 @@ module ForemanFogProxmox
         type: 'lxc', 
         node: node.to_s,
         memory: 512 * MEGA, 
-        templated: 0).merge(Fog::Proxmox::DiskHelper.flatten(volume_container_defaults)).merge(Fog::Proxmox::NicHelper.container_flatten(interface_container_defaults))
+        templated: 0).merge(Fog::Proxmox::DiskHelper.flatten(volume_server_defaults)).merge(Fog::Proxmox::DiskHelper.flatten(volume_container_defaults)).merge(Fog::Proxmox::NicHelper.container_flatten(interface_container_defaults))
     end
 
     def vm_instance_defaults

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_volumes_edit.html.erb

@@ -20,53 +20,40 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% server = type == 'qemu' %>
 <% container = type == 'lxc' %>
 
-<%= new_child_fields_template(f, :server_volumes, {
+<%= new_child_fields_template_typed(f, :volumes, {
+              :type => 'server',
               :object  => compute_resource.new_volume_server,
               :partial => provider_partial(compute_resource, 'server/volume'),
               :form_builder_attrs => { :type => type, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume') },
               :layout => "compute_resources_vms/form/#{item_layout}_layout" }) %>
-<%= new_child_fields_template(f, :container_volumes, {
+<%= new_child_fields_template_typed(f, :volumes, {
+              :type => 'container',
               :object  => compute_resource.new_volume_container(id: 'mp0'),
               :partial => provider_partial(compute_resource, 'container/volume_mp'),
               :form_builder_attrs => { :type => type, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume') },
               :layout => "compute_resources_vms/form/#{item_layout}_layout" }) %>
 
 
-<% if server %>
-<div id="server_volumes">
-    <%= f.fields_for :volumes do |i| %>
-        <%= render :partial => provider_partial(compute_resource, 'server/volume'), :locals => { :f => i, :type => type, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume') }, :layout => "compute_resources_vms/form/#{item_layout}_layout" %>
-    <% end %>
-</div>
-<%= second_child_fields_template(f, :volumes, {
-              :object  => compute_resource.new_volume_container(id: 'rootfs'),
-              :partial => provider_partial(compute_resource, 'container/volume_rootfs'),
-              :type => 'container',
-              :form_builder_attrs => { :type => type, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume') },
-              :layout => "compute_resources_vms/form/#{item_layout}_layout" }) %>
-<% end %>
-<% if container %>
-<div id="container_volumes">
+
     <%= f.fields_for :volumes do |i| %>
-        <% if i.object.id == 'rootfs' %>
-            <%= render :partial => provider_partial(compute_resource, 'container/volume_rootfs'), :locals => { :f => i, :type => type, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume') }, :layout => "compute_resources_vms/form/#{item_layout}_layout" %>
-        <% else %>
-            <%= render :partial => provider_partial(compute_resource, 'container/volume_mp'), :locals => { :f => i, :type => type, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume') }, :layout => "compute_resources_vms/form/#{item_layout}_layout" %>
-        <% end %>
-    <% end %>
-</div>
-<%= second_child_fields_template(f, :volumes, {
-              :object  => compute_resource.new_volume_server,
-              :partial => provider_partial(compute_resource, 'server/volume'),
-              :type => 'server',
-              :form_builder_attrs => { :type => type, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume') },
-              :layout => "compute_resources_vms/form/#{item_layout}_layout" }) %>
-<% end %>
-<% if new_vm %>
-    <%= add_child_link '+ ' + _("Add Volume"), :server_volumes, { :class => "info", :style => ("display: none;" unless server), :title => _('add new storage volume') } %>
-<% end %>
+            <% if i.object.id == 'rootfs' %>
+            <div id="container_volumes_rootfs" style="<%= 'display: ' + (container ? 'block' : 'none') + ';' %>">
+                <%= render :partial => provider_partial(compute_resource, 'container/volume_rootfs'), :locals => { :f => i, :type => type, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume'), :disabled => !container }, :layout => "compute_resources_vms/form/#{item_layout}_layout" %>
+            </div>  
+            <% elsif mount_point_disk?(i.object.id) %>
+            <div id="container_volumes_mp" style="<%= 'display: ' + (container ? 'block' : 'none') + ';' %>">
+                <%= render :partial => provider_partial(compute_resource, 'container/volume_mp'), :locals => { :f => i, :type => type, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume'), :disabled => !container }, :layout => "compute_resources_vms/form/#{item_layout}_layout" %>
+            </div>
+            <% elsif server_disk?(i.object.id) %>
+            <div id="server_volumes" style="<%= 'display: ' + (server ? 'block' : 'none') + ';' %>">
+                <%= render :partial => provider_partial(compute_resource, 'server/volume'), :locals => { :f => i, :type => type, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume'), :disabled => !server }, :layout => "compute_resources_vms/form/#{item_layout}_layout" %>
+            </div>
+            <% end %> 
+    <% end %>  
+
 <% if new_vm %>
-    <%= add_child_link '+ ' + _("Add Volume"), :container_volumes, { :class => "info", :style => ("display: none;" unless container), :title => _('add new storage volume') } %>
+    <%= add_child_link_typed '+ ' + _("Add Volume"), :volumes, 'server', { :class => "info #{'hide' unless server}", :title => _('add new storage volume') } %>
+    <%= add_child_link_typed '+ ' + _("Add Volume"), :volumes, 'container', { :class => "info #{'hide' unless container}", :title => _('add new storage volume') } %>
 <% end %>
 
 

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

@@ -20,6 +20,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= field_set_tag _("Mount point"), :id => "container_volume_#{f.index}", :class => ('hide' unless container), :disabled => !container do %> 
     <%= f.hidden_field :volid if !new_vm %>
     <%= select_f f, :storage, compute_resource.storages, :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2", :disabled => !new_vm %>
+    <%= text_f f, :mp, :label => _('Mount point'), :label_size => "col-md-2", :disabled => !new_vm, :required => true %>
     <%= counter_f f, :device, :label => _('Device'), :label_size => "col-md-2", :class => ('hide' if f.object.rootfs?), :disabled => (!new_vm || f.object.rootfs?), :'data-soft-max' => 10 %>
     <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2", :disabled => !new_vm %>
 <% end %>

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

@@ -16,6 +16,7 @@ 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 %>
+
 <% server = type == 'qemu' %>
 
 <%= field_set_tag n_("Main option", "Main options", 2), :id => "server_config_options", :class => 'hide', :disabled => !server do %>

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

@@ -21,7 +21,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= f.hidden_field :volid if !new_vm %>
     <%= select_f f, :storage, compute_resource.storages, :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2", :disabled => !new_vm %>
     <%= select_f f, :controller, proxmox_controllers_map, :id, :name, { }, :label => _('Controller'), :label_size => "col-md-2", :disabled => !new_vm, :onchange => 'controllerSelected(this)' %>
-    <%= counter_f f, :device, :label => _('Device'), :label_size => "col-md-2", :disabled => !new_vm, :'data-soft-max' => proxmox_max_device(f.object.controller) %>
+    <%= counter_f f, :device, :label => _('Device'), :label_size => "col-md-2", :disabled => !new_vm, :'data-soft-max' => proxmox_max_device(f.object.controller), :onchange => 'deviceSelected(this)' %>
     <%= select_f f, :cache, proxmox_caches_map, :id, :name, { }, :label => _('Cache'), :label_size => "col-md-2" %>
     <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2", :disabled => !new_vm %>
 <% end %>

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.5.4'.freeze
+  VERSION = '0.5.5'.freeze
 end

data/test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb

@@ -45,7 +45,8 @@ class ProxmoxServerHelperTest < ActiveSupport::TestCase
           'sockets' => '1'
         },
         'volumes_attributes' => {
-          '0'=> { 'controller' => 'scsi', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824', 'cache' => 'none' }
+          '0'=> { 'controller' => 'scsi', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824', 'cache' => 'none' },
+          '1'=> { 'controller' => 'virtio', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824', 'cache' => 'none' }
         }, 
         'interfaces_attributes' => { 
           '0' => { 'id' => 'net0', 'model' => 'virtio', 'bridge' => 'vmbr0', 'firewall' => '0', 'link_down' => '0', 'rate' => nil },
@@ -92,10 +93,20 @@ class ProxmoxServerHelperTest < ActiveSupport::TestCase
     test '#volume with scsi 1Gb' do       
       volumes = parse_server_volumes(host['volumes_attributes'])
       assert !volumes.empty?
+      assert volumes.size, 2
       assert volume = volumes.first
       assert volume.has_key?(:scsi0)
       assert_equal 'local-lvm:1073741824,cache=none', volume[:scsi0]
     end    
+
+    test '#volume with virtio 1Gb' do       
+      volumes = parse_server_volumes(host['volumes_attributes'])
+      assert !volumes.empty?
+      assert volumes.size, 2
+      assert volume = volumes[1]
+      assert volume.has_key?(:virtio0)
+      assert_equal 'local-lvm:1073741824,cache=none', volume[:virtio0]
+    end    
     
     test '#volume delete scsi0' do       
       volumes = parse_server_volumes(host_delete['volumes_attributes'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Tristan Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-proxmox
@@ -189,11 +189,11 @@ signing_key:
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files:
-- test/functional/compute_resources_controller_test.rb
-- test/factories/proxmox_factory.rb
 - test/unit/foreman_fog_proxmox/proxmox_test_helpers.rb
-- test/unit/foreman_fog_proxmox/proxmox_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
-- test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_test.rb
+- test/factories/proxmox_factory.rb
+- test/functional/compute_resources_controller_test.rb
 - test/test_plugin_helper.rb