foreman_fog_proxmox 0.7.0 → 0.8.0

data/app/models/concerns/host_ext/proxmox/interfaces.rb

@@ -0,0 +1,37 @@
+# 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 HostExt::Proxmox::Interfaces
+    extend ActiveSupport::Concern
+    def update(attributes = {})
+        add_interfaces_to_compute_attributes(attributes)
+        super(attributes)
+    end
+    def add_interfaces_to_compute_attributes(attributes)
+        attributes['compute_attributes']['interfaces_attributes'] = {}
+        attributes['interfaces_attributes'].each { |index,interface_attributes| add_interface_to_compute_attributes(index,interface_attributes,attributes['compute_attributes']['interfaces_attributes']) }
+    end
+    def add_interface_to_compute_attributes(index,interface_attributes,compute_attributes)
+        compute_attributes[index] = {}
+        compute_attributes[index].store('id',interface_attributes['identifier'])
+        compute_attributes[index].store('_delete',interface_attributes['_destroy'])
+        compute_attributes[index].store('macaddr',interface_attributes['mac'])
+        compute_attributes[index].merge!(interface_attributes['compute_attributes'].reject { |k,_v| k == 'id' })
+    end
+end

data/app/models/concerns/orchestration/proxmox/compute.rb

@@ -0,0 +1,38 @@
+# 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 Orchestration::Proxmox::Compute
+    extend ActiveSupport::Concern
+
+    def setComputeUpdate
+        logger.info "Update Proxmox Compute instance for #{name}"
+        final_compute_attributes = compute_attributes.merge(compute_resource.host_compute_attrs(self))
+        compute_resource.save_vm uuid, final_compute_attributes
+    rescue => e
+        failure _("Failed to update a compute %{compute_resource} instance %{name}: %{e}") % { :compute_resource => compute_resource, :name => name, :e => e }, e
+    end
+
+    def delComputeUpdate
+        logger.info "Undo Update Proxmox Compute instance for #{name}"
+        final_compute_attributes = old.compute_attributes.merge(compute_resource.host_compute_attrs(old))
+        compute_resource.save_vm uuid, final_compute_attributes
+    rescue => e
+        failure _("Failed to undo update compute %{compute_resource} instance %{name}: %{e}") % { :compute_resource => compute_resource, :name => name, :e => e }, e
+    end
+end

data/app/models/foreman_fog_proxmox/proxmox.rb

@@ -18,7 +18,10 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 require 'fog/proxmox'
+require 'fog/proxmox/helpers/nic_helper'
+require 'fog/proxmox/helpers/disk_helper'
 require 'foreman_fog_proxmox/semver'
+require 'foreman_fog_proxmox/value'
 
 module ForemanFogProxmox
   class Proxmox < ComputeResource
@@ -42,7 +45,7 @@ module ForemanFogProxmox
     end
 
     def capabilities
-      [:build, :new_volume, :image]
+      [:build, :new_volume, :new_interface, :image]
     end
 
     def self.model_name
@@ -65,7 +68,11 @@ module ForemanFogProxmox
       version_suitable?
     rescue => e
       errors[:base] << e.message
-      errors[:url] << e.message
+      if e.message.include?('SSL')
+        errors[:ssl_certs] << e.message
+      else
+        errors[:url] << e.message
+      end
     end
 
     def nodes
@@ -129,12 +136,17 @@ module ForemanFogProxmox
       host.interfaces.select(&:physical?).each.with_index.reduce({}) do |hash, (nic, index)|
         # 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)
+        raise ::Foreman::Exception.new _("Invalid identifier interface[%{index}]. Must be net[n] with n integer >= 0" % { index: index }) unless Fog::Proxmox::NicHelper.nic?(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)
+        mac = nic.mac
+        mac = nic.attributes['mac'] unless mac
+        nic_compute_attributes.store(:macaddr, mac) if (mac && !mac.empty?)
+        interface_compute_attributes = host.compute_attributes['interfaces_attributes'].select { |_k,v| v['id'] == nic.identifier }
+        nic_compute_attributes.store(:_delete, interface_compute_attributes[interface_compute_attributes.keys[0]]['_delete']) unless interface_compute_attributes.empty?
         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?)
         hash.merge(index.to_s => nic_compute_attributes)
@@ -187,35 +199,17 @@ module ForemanFogProxmox
       Fog::Proxmox::Compute::Interface.new(opts)
     end
 
-    # used by host.clone
     def vm_compute_attributes(vm)
-      vm_attrs = vm.attributes.reject { |key,value| [:config, :vmid].include?(key.to_sym) || value.to_s.empty? }
-      vm_attrs = set_vm_config_attributes(vm, vm_attrs)
-      vm_attrs = set_vm_volumes_attributes(vm, vm_attrs)
-      vm_attrs = set_vm_interfaces_attributes(vm, vm_attrs)
-      vm_attrs
-    end
-
-    def set_vm_config_attributes(vm, vm_attrs)
+      vm_attrs = {}
       if vm.respond_to?(:config)
-        config = vm.config.attributes.reject { |key,value| [:disks, :interfaces, :vmid].include?(key) || value.to_s.empty?}
-        vm_attrs[:config_attributes] = config
-      end
-      vm_attrs
-    end
-
-    def set_vm_volumes_attributes(vm, vm_attrs)
-      if vm.config.respond_to?(:disks)
-        volumes = vm.config.disks || []
-        vm_attrs[:volumes_attributes] = Hash[volumes.each_with_index.map { |volume, idx| [idx.to_s, volume.attributes] }]
-      end
-      vm_attrs
-    end
-
-    def set_vm_interfaces_attributes(vm, vm_attrs)
-      if vm.config.respond_to?(:interfaces)
-        interfaces = vm.config.interfaces || []
-        vm_attrs[:interfaces_attributes] = Hash[interfaces.each_with_index.map { |interface, idx| [idx.to_s, interface.attributes] }]
+        vm_attrs = vm_attrs.merge(vmid: vm.identity, node_id: vm.node_id, type: vm.type)
+        if vm.config.respond_to?(:disks)
+          vm_attrs[:volumes_attributes] = Hash[vm.config.disks.each_with_index.map { |disk, idx| [idx.to_s, disk.attributes] }]
+        end
+        if vm.config.respond_to?(:interfaces)
+          vm_attrs[:interfaces_attributes] = Hash[vm.config.interfaces.each_with_index.map { |interface, idx| [idx.to_s, interface.attributes] }]
+        end
+        vm_attrs[:config_attributes] = vm.config.attributes.reject { |key,value| [:disks, :interfaces, :vmid, :node_id, :node, :type].include?(key) || !vm.config.respond_to?(key) || ForemanFogProxmox::Value.empty?(value.to_s) || Fog::Proxmox::DiskHelper.disk?(key.to_s) || Fog::Proxmox::NicHelper.nic?(key.to_s) }
       end
       vm_attrs
     end
@@ -239,15 +233,19 @@ module ForemanFogProxmox
     end
 
     def new_container_vm(new_attr = {})
-      new_attr.merge(node_id: node_id)
-      vm = node.containers.new(parse_container_vm(vm_container_instance_defaults.merge(new_attr.merge(type: 'lxc'))).deep_symbolize_keys)
+      options = new_attr
+      options = options.merge(node_id: node_id).merge(type: 'lxc').merge(vmid: next_vmid)
+      options= vm_container_instance_defaults.merge(options) if new_attr.empty?
+      vm = node.containers.new(parse_container_vm(options).deep_symbolize_keys)
       logger.debug(_("new_container_vm() vm.config=%{config}") % { config: vm.config.inspect })
       vm
     end
 
     def new_server_vm(new_attr = {})
-      new_attr.merge(node_id: node_id)
-      vm = node.servers.new(parse_server_vm(vm_server_instance_defaults.merge(new_attr.merge(type: 'qemu'))).deep_symbolize_keys)
+      options = new_attr
+      options = options.merge(node_id: node_id).merge(type: 'qemu').merge(vmid: next_vmid)
+      options = vm_server_instance_defaults.merge(options) if new_attr.empty?
+      vm = node.servers.new(parse_server_vm(options).deep_symbolize_keys)
       logger.debug(_("new_server_vm() vm.config=%{config}") % { config: vm.config.inspect })
       vm
     end
@@ -331,14 +329,51 @@ module ForemanFogProxmox
       !find_vm_by_uuid(image).nil?
     end
 
+    def save_volumes(vm, volumes_attributes)
+      if volumes_attributes
+        volumes_attributes.each_value do |volume_attributes|
+          id = volume_attributes['id']
+          disk = vm.config.disks.get(id)
+          delete = volume_attributes['_delete']
+          if disk
+            if delete == '1'
+              vm.detach(id)
+              device = Fog::Proxmox::DiskHelper.extract_device(id)
+              vm.detach('unused' + device.to_s)
+            else
+              diff_size = volume_attributes['size'].to_i - disk.size
+              raise ::Foreman::Exception.new(_("Unable to shrink %{id} size. Proxmox allows only increasing size.") % { id: id }) unless diff_size >= 0
+              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'])
+              end
+            end
+          else
+            options = {}
+            options.store(:mp, volume_attributes['mp']) if vm.container?
+            disk_attributes = { id: id, storage: volume_attributes['storage'], size: (volume_attributes['size'].to_i / GIGA).to_s }
+            vm.attach(disk_attributes, options) unless delete == '1'
+          end
+        end
+      end
+    end
+
     def save_vm(uuid, new_attributes)
       vm = find_vm_by_uuid(uuid)
-      templated = new_attributes[:templated]
+      templated = new_attributes['templated']
       if (templated == '1' && !vm.templated?)
         vm.create_template
       else
+        volumes_attributes = new_attributes['volumes_attributes']
+        save_volumes(vm, volumes_attributes)
         parsed_attr = vm.container? ? parse_container_vm(new_attributes.merge(type: vm.type)) : parse_server_vm(new_attributes.merge(type: vm.type))
-        vm.update(parsed_attr.reject { |key,value| [:templated,:ostemplate,:ostemplate_file,:ostemplate_storage].include? key.to_sym || ForemanFogProxmox::Value.empty?(value) })
+        config_attributes = parsed_attr.reject { |key,_value| [:templated,:ostemplate,:ostemplate_file,:ostemplate_storage,:volumes_attributes].include? key.to_sym }
+        config_attributes = config_attributes.reject { |_key,value| ForemanFogProxmox::Value.empty?(value) }
+        cdrom_attributes = parsed_attr.select { |_key,value| Fog::Proxmox::DiskHelper.cdrom?(value.to_s) }
+        config_attributes = config_attributes.reject { |key,_value| Fog::Proxmox::DiskHelper.disk?(key) }
+        vm.update(config_attributes.merge(cdrom_attributes))   
       end
       vm = find_vm_by_uuid(uuid)
     end

data/app/overrides/compute_resources_vms/form/remove_new_vm_from_removable_layout.rb

@@ -0,0 +1,24 @@
+# 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/>.
+
+Deface::Override.new(
+    :virtual_path => "compute_resources_vms/form/_removable_layout",
+    :name => "remove_new_vm_from_removable_layout",
+    :replace_contents => "div.remove-button",
+    :partial => "compute_resources_vms/form/proxmox/removable_layout",
+    :original => "8b7383e57fbe158fc12bf8bc1003431f2f2cb6f5"
+)

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

@@ -22,7 +22,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= 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 => true, :onchange => "sslVerifyPeerSelected(this)" %>
+<%= 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.") %>
 <%= select_f f, :node_id, nodes, :node, :node, { :include_blank => true }, :label => _('Node'), :label_size => "col-md-2", :required => true, :disabled => (node_id != '') %>

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

@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
-<% logger.debug("vm_type=#{vm_type}") %>
 
 <%= render :partial => provider_partial(compute_resource, 'network'),
               :locals => { :f => i, :vm_type => vm_type, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface'), :selected_cluster => selected_cluster },

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

@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
-<% logger.debug("vm_type=#{vm_type}") %>
 
 <%= new_child_fields_template(f, compute_resource.interfaces_attrs_name, {
         :object => compute_resource.new_interface,

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

@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <% compute_attributes = f.options[:parent_builder].object.compute_attributes %>
 <% vm_type = compute_attributes ? compute_attributes['type'] : f.object.type %>
-<% logger.debug("vm_type=#{vm_type}") %>
 
 <%= f.fields_for 'compute_attributes', OpenStruct.new(f.object.compute_attributes) do |f| %>
     <%= render provider_partial(@host.compute_resource, 'network'), :f => f, :vm_type => vm_type, :disabled => f.object.persisted?, :compute_resource => @host.compute_resource, :new_host => new_vm, :new_vm => new_vm %>

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

@@ -35,25 +35,22 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 
     <%= f.fields_for :volumes do |i| %>
-            <% if i.object.id == 'rootfs' %>
+            <% 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, :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) %>
+            <% 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, :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) %>
+            <% 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, :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_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/_removable_layout.html.erb

@@ -0,0 +1,22 @@
+<%# 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/>. %>
+
+<% volume_rootfs = f.object.respond_to?(:rootfs?) && f.object.rootfs? %>
+
+<% unless volume_rootfs %>
+    <%= remove_child_link('X', f, { :method => :'_delete', :title => local_assigns[:remove_title], :class => 'label label-danger' }) %>
+<% end %>

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

@@ -17,7 +17,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% container = type == 'lxc' %>
 
-<%= field_set_tag _("Nic"), :id => "container_network", :style => ('display: none;' unless container), :disabled => !container do %>  
+<%= field_set_tag _("Nic"), :id => "container_network_#{f.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" %>
     <%= 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" %>

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

@@ -16,11 +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/>. %>
 
 <% container = type == 'lxc' %>
+<% new_volume = f.object.volid.nil? %>
 
-<%= field_set_tag _("Mount point"), :id => "container_volume_#{f.index}", :class => ('hide' unless container), :disabled => !container do %> 
+<%= field_set_tag _("Mount point"), :id => "container_volume_mp_#{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 => _('Path'), :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 %>
+    <%= select_f f, :storage, compute_resource.storages, :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2" %>
+    <%= text_f f, :mp, :label => _('Path'), :label_size => "col-md-2", :required => true, :help_inline => _("e.g. /path/to/") %>
+    <%= counter_f f, :device, :label => _('Device'), :label_size => "col-md-2", :class => ('hide' if f.object.rootfs?), :disabled => (!new_volume || f.object.rootfs?), :'data-soft-max' => 10 %>
+    <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2" %>
 <% end %>

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

@@ -17,8 +17,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% container = type == 'lxc' %>
 
-<%= field_set_tag _("Rootfs"), :id => "container_volume_#{f.index}", :class => ('hide' unless container), :disabled => !container do %> 
+<%= field_set_tag _("Rootfs"), :id => "container_volume_rootfs", :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 %>
-    <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2", :disabled => !new_vm %>
+    <%= select_f f, :storage, compute_resource.storages, :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2" %>
+    <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2" %>
 <% end %>

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

@@ -17,7 +17,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% server = type == 'qemu' %>
 
-<%= field_set_tag _("Nic"), :id => "server_network", :style => ('display: none;' unless server), :disabled => !server do %> 
+<%= field_set_tag _("Nic"), :id => "server_network_#{f.index}", :style => ('display: none;' unless server), :disabled => !server do %> 
+    <%= f.hidden_field :id if !new_vm %>
     <%= select_f f, :model, proxmox_networkcards_map, :id, :name, { }, :label => _('Card'), :label_size => "col-md-2" %>
     <%= select_f f, :bridge, compute_resource.bridges, :iface, :iface, { }, :label => _('Bridge'), :label_size => "col-md-2" %>
     <%= counter_f f, :tag, :class => "input-mini", :label => _('VLAN tag'), :label_size => "col-md-2" %>

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

@@ -16,12 +16,13 @@ You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <% server = type == 'qemu' %>
+<% new_volume = f.object.volid.nil? %>
 
 <%= field_set_tag _("Disk"), :id => "server_volume_#{f.index}", :class => ('hide' unless server), :disabled => !server 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 %>
-    <%= 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), :onchange => 'deviceSelected(this)' %>
+    <%= select_f f, :storage, compute_resource.storages, :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)' %>
+    <%= counter_f f, :device, :label => _('Device'), :label_size => "col-md-2", :disabled => !new_volume, :'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 %>
+    <%= byte_size_f f, :size, :class => "input-mini", :label => _("Size"), :label_size => "col-md-2" %>
 <% end %>

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

@@ -26,7 +26,6 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= prop :type %>
     <%= prop :node_id %>
     <%= prop :templated? %>
-    <%= prop :mac %>
     <%= prop :memory %>
     <% unless @vm.container? %>
       <%= prop :vga %>
@@ -36,5 +35,6 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= prop :vmid %>
     <%= prop :description %>
     <%= prop :disks %>
+    <%= prop :nics %>
   </table>
 </div>