foreman_fog_proxmox 0.12.1 → 0.13.2

data/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb

@@ -20,6 +20,7 @@
 module ForemanFogProxmox
   module ProxmoxVmQueries
     include ProxmoxPools
+    include ProxmoxVmUuidHelper
 
     def nodes
       nodes = client.nodes.all if client
@@ -30,6 +31,7 @@ module ForemanFogProxmox
       node = client.nodes.get node_id
       node ||= default_node
       storages = node.storages.list_by_content_type type
+      logger.debug(format(_('storages(): node_id %<node_id>s type %<type>s'), node_id: node_id, type: type))
       storages.sort_by(&:storage)
     end
 
@@ -50,25 +52,26 @@ module ForemanFogProxmox
     def find_vm_by_uuid(uuid)
       # look for the uuid on all known nodes
       vm = nil
+      vmid = extract_vmid(uuid)
       nodes.each do |node|
-        vm = find_vm_in_servers_by_uuid(node.servers, uuid)
-        vm ||= find_vm_in_servers_by_uuid(node.containers, uuid)
+        vm = find_vm_in_servers_by_vmid(node.servers, vmid)
+        vm ||= find_vm_in_servers_by_vmid(node.containers, vmid)
         unless vm.nil?
-          logger.debug("found vm #{uuid} on node #{node.node}")
+          logger.debug("found vm #{vmid} on node #{node.node}")
           break
         end
       end
       vm
     end
 
-    def find_vm_in_servers_by_uuid(servers, uuid)
-      vm = servers.get(uuid) if !uuid.nil? && !uuid.to_s.empty?
+    def find_vm_in_servers_by_vmid(servers, vmid)
+      vm = servers.get(vmid) unless ForemanFogProxmox::Value.empty?(vmid)
       pool_owner(vm) if vm
       vm
     rescue Fog::Errors::NotFound
       nil
     rescue StandardError => e
-      Foreman::Logging.exception(format(_('Failed retrieving proxmox server vm by vmid=%<vmid>s'), vmid: uuid), e)
+      Foreman::Logging.exception(format(_('Failed retrieving proxmox server vm by vmid=%<vmid>s'), vmid: vmid), e)
       raise(ActiveRecord::RecordNotFound, e)
     end
   end

data/app/models/foreman_fog_proxmox/proxmox_volumes.rb

@@ -18,13 +18,17 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 require 'fog/proxmox/helpers/disk_helper'
+require 'foreman_fog_proxmox/hash_collection'
 
 module ForemanFogProxmox
   module ProxmoxVolumes
     include ProxmoxVmHelper
 
-    def delete_volume(vm, id)
+    def delete_volume(vm, id, volume_attributes)
+      logger.info(format(_('vm %<vmid>s delete volume %<volume_id>s'), vmid: vm.identity, volume_id: id))
       vm.detach(id)
+      return unless volume_type?(volume_attributes, 'hard_disk')
+
       device = Fog::Proxmox::DiskHelper.extract_device(id)
       vm.detach('unused' + device.to_s)
     end
@@ -36,25 +40,65 @@ module ForemanFogProxmox
       options
     end
 
-    def update_volume(vm, id, volume_attributes)
-      disk = vm.config.disks.get(id)
-      diff_size = volume_attributes['size'].to_i - disk.size
-      raise ::Foreman::Exception, format(_('Unable to shrink %<id>s size. Proxmox allows only increasing size.'), id: id) unless diff_size >= 0
+    def update_volume_required?(old_volume_attributes, new_volume_attributes)
+      old_h = ForemanFogProxmox::HashCollection.new_hash_reject_empty_values(old_volume_attributes)
+      new_h = ForemanFogProxmox::HashCollection.new_hash_reject_empty_values(new_volume_attributes)
+      new_h = ForemanFogProxmox::HashCollection.new_hash_reject_keys(new_h, ['cdrom', 'cloudinit', 'storage_type'])
+      !ForemanFogProxmox::HashCollection.equals?(old_h.with_indifferent_access, new_h.with_indifferent_access)
+    end
 
-      if diff_size > 0
-        extension = '+' + (diff_size / GIGA).to_s + 'G'
-        vm.extend(id, extension)
-      elsif disk.storage != volume_attributes['storage']
-        vm.move(id, volume_attributes['storage'])
+    def update_cdrom(vm, disk, volume_attributes)
+      new_disk = { id: disk.id }
+      if ['none', 'cdrom'].include?(volume_attributes[:cdrom])
+        new_disk[:volid] = volume_attributes[:cdrom]
       else
-        options = volume_options(vm, id, volume_attributes)
-        vm.attach({ :id => disk.id, :volid => disk.volid, :size => disk.size }, options)
+        new_disk[:storage] = volume_attributes[:storage]
+        new_disk[:volid] = volume_attributes[:volid]
+      end
+      vm.attach(new_disk, {})
+    end
+
+    def extend_volume(vm, id, diff_size)
+      extension = '+' + (diff_size / GIGA).to_s + 'G'
+      logger.info(format(_('vm %<vmid>s extend volume %<volume_id>s to %<extension>s'), vmid: vm.identity, volume_id: id, extension: extension))
+      vm.extend(id, extension)
+    end
+
+    def move_volume(id, vm, new_storage)
+      logger.info(format(_('vm %<vmid>s move volume %<volume_id>s into %<new_storage>s'), vmid: vm.identity, volume_id: id, new_storage: new_storage))
+      vm.move(id, new_storage)
+    end
+
+    def update_options(disk, vm, volume_attributes)
+      options = volume_options(vm, disk.id, volume_attributes) if volume_type?(volume_attributes, 'hard_disk')
+      logger.info(format(_('vm %<vmid>s update volume %<volume_id>s to %<options>s'), vmid: vm.identity, volume_id: disk.id, options: options))
+      new_disk = { id: disk.id }
+      new_disk[:volid] = disk.volid
+      vm.attach(new_disk, options)
+    end
+
+    def update_volume(vm, disk, volume_attributes)
+      id = disk.id
+      if volume_type?(volume_attributes, 'cdrom')
+        update_cdrom(vm, disk, volume_attributes)
+      elsif volume_type?(volume_attributes, 'hard_disk')
+        diff_size = volume_attributes['size'].to_i - disk.size if volume_attributes['size'] && disk.size
+        raise ::Foreman::Exception, format(_('Unable to shrink %<id>s size. Proxmox allows only increasing size.'), id: id) unless diff_size >= 0
+
+        new_storage = volume_attributes['storage']
+
+        if diff_size > 0
+          extend_volume(vm, id, diff_size)
+        elsif disk.storage != new_storage
+          move_volume(id, vm, new_storage)
+        else
+          update_options(disk, vm, volume_attributes)
+        end
       end
     end
 
-    def volume_exists?(volume_attributes)
-      volid = volume_attributes.key?('volid') ? volume_attributes['volid'] : ''
-      volid.present?
+    def volume_exists?(vm, volume_attributes)
+      vm.attributes.key?(volume_attributes['id'])
     end
 
     def volume_to_delete?(volume_attributes)
@@ -63,28 +107,41 @@ module ForemanFogProxmox
 
     def extract_id(vm, volume_attributes)
       id = ''
-      if volume_exists?(volume_attributes)
+      if volume_exists?(vm, volume_attributes)
         id = volume_attributes['id']
       else
         device = vm.container? ? 'mp' : volume_attributes['controller']
-        id = device + volume_attributes['device']
+        id = volume_type?(volume_attributes, 'cdrom') ? 'ide2' : device + volume_attributes['device']
       end
       id
     end
 
     def add_volume(vm, id, volume_attributes)
-      options = volume_options(vm, id, volume_attributes)
-      disk_attributes = { id: id, storage: volume_attributes['storage'], size: (volume_attributes['size'].to_i / GIGA).to_s }
+      disk_attributes = { id: id }
+      if volume_type?(volume_attributes, 'hard_disk')
+        options = volume_options(vm, id, volume_attributes)
+        disk_attributes[:storage] = volume_attributes['storage']
+        disk_attributes[:size] = (volume_attributes['size'].to_i / GIGA).to_s
+      elsif volume_type?(volume_attributes, 'cdrom')
+        disk_attributes[:volid] = volume_attributes[:iso]
+      elsif volume_type?(volume_attributes, 'cloud_init')
+        disk_attributes[:storage] = volume_attributes['storage']
+        disk_attributes[:volid] = "#{volume_attributes['storage']}:cloudinit"
+      end
+      logger.info(format(_('vm %<vmid>s add volume %<volume_id>s'), vmid: vm.identity, volume_id: id))
+      logger.debug(format(_('add_volume(%<vmid>s) disk_attributes=%<disk_attributes>s'), vmid: vm.identity, disk_attributes: disk_attributes))
       vm.attach(disk_attributes, options)
     end
 
     def save_volume(vm, volume_attributes)
+      logger.debug(format(_('save_volume(%<vmid>s) volume_attributes=%<volume_attributes>s'), vmid: vm.identity, volume_attributes: volume_attributes))
       id = extract_id(vm, volume_attributes)
-      if volume_exists?(volume_attributes)
+      if volume_exists?(vm, volume_attributes)
         if volume_to_delete?(volume_attributes)
-          delete_volume(vm, id)
+          delete_volume(vm, id, volume_attributes)
         else
-          update_volume(vm, id, volume_attributes)
+          disk = vm.config.disks.get(id)
+          update_volume(vm, disk, volume_attributes) if update_volume_required?(disk.attributes, volume_attributes)
         end
       else
         add_volume(vm, id, volume_attributes)

data/app/services/foreman_fog_proxmox/node_dashboard/data.rb

@@ -24,9 +24,13 @@ module ForemanFogProxmox
         @filter = filter
       end
 
+      def node
+        @compute_resource = ComputeResource.where(type: 'ForemanFogProxmox::Proxmox').first
+        @compute_resource.nodes.first
+      end
+
       def node_id
-        @compute_resource = ComputeResource.find_by(type: 'ForemanFogProxmox::Proxmox')
-        @compute_resource&.node_id
+        node&.identity
       end
 
       def statistics

data/app/views/api/v2/compute_resources/proxmox.json.rabl

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-attributes :url, :user, :password, :ssl_verify_peer, :ssl_certs, :renew
+attributes :url, :user, :ssl_verify_peer, :ssl_certs, :renew

data/app/views/compute_resources/form/_proxmox.html.erb

@@ -17,13 +17,26 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_compute_resource', "data-turbolinks-track" => true %>
 
-<% nodes = f.object.nodes rescue nil %>
-<% token_expired = f.object.token_expired? %>
-<% token_deadline = f.object.token_deadline %>
-<%= checkbox_f f, :renew, :label => _("Renew expired token ?"), :checked_value => '1', :label_help => _("Token expires on #{token_deadline}") %>
-<%= text_f f, :url, :help_block => _("e.g. https://127.0.0.1:8006/api2/json"), :help_inline_permanent => load_button_f(f, !!nodes, _("Test failed")) %>
-<%= text_f f, :user , :help_block => _("e.g. root@pam") %>
-<%= password_f f, :password, :keep_value => true, :unset => unset_password? %>
-<%= checkbox_f f, :ssl_verify_peer, :label => _("SSL verify peer"), :checked_value => '1', :onchange => "sslVerifyPeerSelected()" %>
-<%= textarea_f f, :ssl_certs, :label => _("X509 Certification Authorities"), :size => "col-md-4",
-  :placeholder => _("Optionally provide a CA, or a correctly ordered CA chain. If left blank, disable ssl_verify_peer.") %>
+<% user_token = f.object.auth_method == 'user_token' %>
+<% access_ticket = f.object.auth_method == 'access_ticket' %>
+<% ssl_verify_peer = f.object.ssl_verify_peer == '1' %>
+<%= select_f f, :auth_method, proxmox_auth_methods_map, :id, :name, { }, :label_help => _("Click Test connection button before changing it"), :label => _('Authentication method'), :label_size => "col-md-2", :required => true, :onchange => 'authMethodSelected();' %>
+<%= field_set_tag _("Common fields"), :id => "compute_ressource_common_field_set" do %>
+  <%= text_f f, :url, :help_block => _("e.g. https://127.0.0.1:8006/api2/json") %>
+  <%= text_f f, :user , :help_block => _("e.g. root@pam") %>
+<% end %>
+<%= field_set_tag _("User token fields"), :id => "compute_ressource_user_token_field_set", :class => ('hide' unless user_token), :disabled => !user_token do %>
+  <%= text_f f, :token_id, :label => _('User token id'), :required => user_token %>
+  <%= text_f f, :token, :label => _('User token value'), :required => user_token, :label_help => _("Click Test connection button to check token") %>
+<% end %>
+<%= field_set_tag _("Access ticket fields"), :id => "compute_ressource_access_ticket_field_set", :class => ('hide' unless access_ticket), :disabled => !access_ticket do %>
+  <%= password_f f, :password, :keep_value => true, :unset => unset_password?, :required => access_ticket %>
+<% end %>
+<%= field_set_tag _("SSL fields"), :id => "compute_ressource_ssl_field_set" do %>  
+  <%= checkbox_f f, :ssl_verify_peer, :label => _("SSL verify peer"), :label_help => _("Click Test connection button before changing it"), :checked_value => '1', :onchange => 'sslVerifyPeerSelected();' %>
+  <%= textarea_f f, :ssl_certs, :label => _("X509 Certification Authorities"), :size => "col-md-4",
+    :placeholder => _("Optionally provide a CA, or a correctly ordered CA chain. If left blank, disable ssl_verify_peer.") %>
+<% end %>
+<div class="col-md-offset-2">
+  <%= test_connection_button_f(f, (f.object.nodes rescue false)) %>
+</div>

data/app/views/compute_resources/show/_proxmox.html.erb

@@ -21,17 +21,17 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 </tr>
 <tr>
   <td><%= _("Version") %></td>
-  <td><%= @compute_resource.version%></td>
+  <td><%= @compute_resource.version %></td>
 </tr>
 <tr>
-  <td><%= _("Token has expired?") %></td>
-  <td><%= @compute_resource.token_expired?%></td>
+  <td><%= _("Authentication method") %></td>
+  <td><%= @compute_resource.auth_method %></td>
 </tr>
 <tr>
-  <td><%= _("Token expires on") %></td>
-  <td><%= @compute_resource.token_deadline%></td>
+  <td><%= _("User token expires") %></td>
+  <td><%= user_token_expiration_date(@compute_resource) %></td>
 </tr>
 <tr>
   <td><%= _("Cluster nodes") %></td>
-  <td><%= @compute_resource.nodes.collect { |node| node.node }%></td>
+  <td><%= cluster_nodes(@compute_resource) %></td>
 </tr>

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

@@ -16,10 +16,12 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% if @host.compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% compute_attributes = f.object.compute_attributes %>
-<% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
+<% logger.debug("_add_vm_type_to_nic_provider_specific_form.html compute_attributes=#{compute_attributes}") %>
 <% node_id = f.object.respond_to?('node_id') ? f.object.node_id : nil %>
 
 <%= f.fields_for 'compute_attributes', OpenStruct.new(f.object.compute_attributes) do |f| %>
+    <% vm_type = compute_attributes.respond_to?('type') ? compute_attributes.type : 'qemu' %>
+    <% logger.debug("_add_vm_type_to_nic_provider_specific_form.html vm_type=#{vm_type}") %>
     <%= render provider_partial(@host.compute_resource, 'network'), :f => f, :vm_type => vm_type, :node_id => node_id, :disabled => f.object.persisted?, :compute_resource => @host.compute_resource, :new_host => new_vm, :new_vm => new_vm %>
 <% end %>
 <% else %>

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

@@ -14,45 +14,63 @@ 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/>. %>
-<% if compute_resource.class == ForemanFogProxmox::Proxmox %>
-<% type = f.object.type %>
-<% node_id = f.object.node_id %>
-<% server = type == 'qemu' %>
-<% container = type == 'lxc' %>
-
-<%= 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, :node_id => node_id, :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_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, :node_id => node_id, :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 compute_resource.class == ForemanFogProxmox::Proxmox %>
+    <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_volume', "data-turbolinks-track" => true %>
+    <% type = f.object.type %>
+    <% node_id = f.object.node_id %>
+    <% server = type == 'qemu' %>
+    <% container = type == 'lxc' %>
+    <% cdrom = f.object.cdrom? %>
+    <% logger.debug("_add_vm_type_to_volumes_edit.html cdrom=#{cdrom}") %>
+    <% cloud_init = f.object.cloud_init? %>
+    <% logger.debug("_add_vm_type_to_volumes_edit.html cloud_init=#{cloud_init}") %>
+    <% container = type == 'lxc' %>
 
+    <%= add_child_link_typed '+ ' + _("Add Hard Disk"), :volumes, 'hard_disk', { :class => "info #{'hide' unless server }", :title => _('add new hard disk') } %>
+    <%= add_child_link_typed '+ ' + _("Add CD-ROM"), :volumes, 'cdrom', { :class => "info #{'hide' if cdrom }", :title => _('add new cd-rom') } %>
+    <%= add_child_link_typed '+ ' + _("Add Cloud-init"), :volumes, 'cloud_init', { :class => "info #{'hide' if cloud_init }", :title => _('add new cloud-init') } %>
+    <%= add_child_link_typed '+ ' + _("Add Mount Point"), :volumes, 'mp', { :class => "info #{'hide' unless container}", :title => _('add new mount point') } %>
+    
+    <%= new_child_fields_template_typed(f, :volumes, {
+                :type => 'hard_disk',
+                :object  => compute_resource.new_typed_volume({},'qemu','hard_disk'),
+                :partial => provider_partial(compute_resource, 'server/volume_hard_disk'),
+                :form_builder_attrs => { :type => type, :node_id => node_id, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove Hard disk') },
+                :layout => "compute_resources_vms/form/#{item_layout}_layout" }) %>
+    <%= new_child_fields_template_typed(f, :volumes, {
+                :type => 'cdrom',
+                :object  => compute_resource.new_typed_volume({},'qemu','cdrom'),
+                :partial => provider_partial(compute_resource, 'server/volume_cdrom'),
+                :form_builder_attrs => { :type => type, :node_id => node_id, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove CDROM') },
+                :layout => "compute_resources_vms/form/#{item_layout}_layout" }) %>
+    <%= new_child_fields_template_typed(f, :volumes, {
+                :type => 'cloud_init',
+                :object  => compute_resource.new_typed_volume({},'qemu','cloud_init'),
+                :partial => provider_partial(compute_resource, 'server/volume_cloud_init'),
+                :form_builder_attrs => { :type => type, :node_id => node_id, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove Cloud-init') },
+                :layout => "compute_resources_vms/form/#{item_layout}_layout" }) %>
+    <%= new_child_fields_template_typed(f, :volumes, {
+                :type => 'mp',
+                :object  => compute_resource.new_typed_volume({ id: 'mp0' }, 'lxc','mp'),
+                :partial => provider_partial(compute_resource, 'container/volume_mp'),
+                :form_builder_attrs => { :type => type, :node_id => node_id, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove mount point') },
+                :layout => "compute_resources_vms/form/#{item_layout}_layout" }) %>
 
     <%= f.fields_for :volumes do |i| %>
             <% if i.object.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, :node_id => node_id, :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 i.object.mount_point? %>
-            <div id="container_volumes_mp" style="<%= 'display: ' + (container ? 'block' : 'none') + ';' %>">
                 <%= render :partial => provider_partial(compute_resource, 'container/volume_mp'), :locals => { :f => i, :type => type, :node_id => node_id, :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 i.object.controller? %>
-            <div id="server_volumes" style="<%= 'display: ' + (server ? 'block' : 'none') + ';' %>">
-                <%= render :partial => provider_partial(compute_resource, 'server/volume'), :locals => { :f => i, :type => type, :node_id => node_id, :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>
+            <% elsif i.object.hard_disk? %>
+                <%= render :partial => provider_partial(compute_resource, 'server/volume_hard_disk'), :locals => { :f => i, :type => type, :node_id => node_id, :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" %>
+            <% elsif i.object.cdrom? %>
+                <%= render :partial => provider_partial(compute_resource, 'server/volume_cdrom'), :locals => { :f => i, :type => type, :node_id => node_id, :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" %>
+            <% elsif i.object.cloud_init? %>                
+                <%= render :partial => provider_partial(compute_resource, 'server/volume_cloud_init'), :locals => { :f => i, :type => type, :node_id => node_id, :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" %>
             <% end %> 
     <% end %>  
 
-    <%= 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') } %>
 <% else %>
 <%= new_child_fields_template(f, :volumes, {
               :object  => volume,
@@ -68,4 +86,3 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= add_child_link '+ ' + _("Add Volume"), :volumes, { :class => "info", :title => _('add new storage volume') } %>
 <% end %>
 <% end %>
-

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

@@ -31,9 +31,9 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= render :partial => "compute_resources_vms/form/proxmox/container/advanced", :locals => { :f => f, :compute_resource =>  compute_resource, :new_vm => new_vm } %>
 
 <!-- Config Options Settings-->
-<%= f.fields_for :config, compute_resource.new_server_vm(object_to_config_hash(f.object)).config, include_id: false do |server_config|%>
-  <%= render :partial => "compute_resources_vms/form/proxmox/server/config", :locals => { :f => server_config, :compute_resource =>  compute_resource, :host => @host, :new_vm => new_vm, :item_layout => 'removable', :type => f.object.type, :node_id => f.object.node_id } %>
+<%= f.fields_for :config, compute_resource.new_typed_vm(object_to_config_hash(f.object, 'qemu'), 'qemu').config, include_id: false do |server_config|%>
+  <%= render :partial => "compute_resources_vms/form/proxmox/server/config", :locals => { :f => server_config, :cloudinit => f.object.cloud_init?, :compute_resource =>  compute_resource, :host => @host, :new_vm => new_vm, :item_layout => 'removable', :type => f.object.type, :node_id => f.object.node_id } %>
 <% end %>
-<%= f.fields_for :config, compute_resource.new_container_vm(object_to_config_hash(f.object)).config, include_id: false do |container_config|%>
+<%= f.fields_for :config, compute_resource.new_typed_vm(object_to_config_hash(f.object, 'lxc'), 'lxc').config, include_id: false do |container_config|%>
   <%= render :partial => "compute_resources_vms/form/proxmox/container/config", :locals => { :f => container_config, :compute_resource =>  compute_resource, :host => @host, :new_vm => new_vm, :item_layout => 'removable', :type => f.object.type, :node_id => f.object.node_id } %>
 <% end %>

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

@@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% volume_rootfs = f.object.respond_to?(:rootfs?) && f.object.rootfs? %>
+<% type = f.object.respond_to?(:storage_type) && f.object.storage_type %>
 
 <% unless volume_rootfs %>
-    <%= remove_child_link('X', f, { :method => :'_delete', :title => local_assigns[:remove_title], :class => 'label label-danger' }) %>
+    <%= remove_child_link_typed('X', f, type, { :method => :'_delete', :title => local_assigns[:remove_title], :class => 'label label-danger' }) %>
 <% end %>
 <% else %>
 <% if new_vm %>

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

@@ -20,14 +20,15 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <%= field_set_tag _("Nic"), :id => "container_network_#{index}", :style => ('display: none;' unless container), :disabled => !container do %>  
     <%= f.hidden_field :id if !new_vm %>
-    <%= text_f f, :name, :label => _('Name'), :label_size => "col-md-2" %>
-    <%= checkbox_f f, :dhcpv4, :label => _('DHCP IPv4') %>
-    <%= text_f f, :cidrv4_prefix, :label => _('CIDR IPv4 prefix'), :label_size => "col-md-2" %>
-    <%= text_f f, :gwv4, :label => _('Gateway IPv4'), :label_size => "col-md-2" %>
-    <%= checkbox_f f, :dhcpv6, :label => _('DHCP IPv6') %>
-    <%= text_f f, :cidrv6_prefix, :label => _('CIDR IPv6 prefix'), :label_size => "col-md-2" %>
-    <%= text_f f, :gwv6, :label => _('Gateway IPv6'), :label_size => "col-md-2" %>
+    <%= text_f f, :name, :label => _('Name'), :label_size => "col-md-2", :required => true, :label_help => _("eth[n] with n integer >= 0, e.g. eth0") %>
+    <%= checkbox_f f, :dhcp, :label => _('DHCP IPv4') %>
+    <%= text_f f, :cidr, :label => _('CIDR IPv4'), :label_size => "col-md-2", :label_help => _("integer within [0..32]") %>
+    <%= text_f f, :gw, :label => _('Gateway IPv4'), :label_size => "col-md-2" %>
+    <%= checkbox_f f, :dhcp6, :label => _('DHCP IPv6') %>
+    <%= text_f f, :cidr6, :label => _('CIDR IPv6'), :label_size => "col-md-2", :label_help => _("integer within [0..128]")%>
+    <%= text_f f, :gw6, :label => _('Gateway IPv6'), :label_size => "col-md-2" %>
     <%= counter_f f, :tag, :class => "input-mini", :label => _('VLAN tag'), :label_size => "col-md-2" %>
     <%= counter_f f, :rate, :class => "input-mini", :label => _('Rate limit'), :label_size => "col-md-2" %>
+    <%= checkbox_f f, :firewall, :label => _('Firewall') %>
     <%= select_f f, :bridge, compute_resource.bridges(node_id), :iface, :iface, { }, :label => _('Bridge'), :label_size => "col-md-2" %>
 <% end %>

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

@@ -24,8 +24,6 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= 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_cdrom', _("CDROM") %>
-  <%= check_box_tag 'show_server_config_cdrom', '1', false, :onclick => "$('#server_config_cdrom').toggle()" %>
   <%= label_tag 'show_server_config_os', _("OS") %>
   <%= check_box_tag 'show_server_config_os', '1', false, :onclick => "$('#server_config_os').toggle()" %>
 <% end %>