foreman_fog_proxmox 0.9.4 → 0.10.0

data/app/models/foreman_fog_proxmox/proxmox_vm_new.rb

@@ -66,7 +66,7 @@ module ForemanFogProxmox
     end
 
     def interface_container_defaults(id = 'net0')
-      { id: id, name: 'eth0', bridge: bridges.first.identity.to_s }
+      { id: id, name: 'eth0', bridge: bridges.first.identity.to_s, dhcpv4: 1, dhcpv6: 1 }
     end
 
     def new_interface(attr = {})
@@ -92,12 +92,24 @@ module ForemanFogProxmox
       Fog::Proxmox::Compute::Interface.new(opts)
     end
 
+    def default_node
+      nodes.first
+    end
+
+    def default_node_id
+      default_node.node
+    end
+
+    def next_vmid
+      default_node.servers.next_id
+    end
+
     def vm_server_instance_defaults
       ActiveSupport::HashWithIndifferentAccess.new(
         name: "foreman_#{Time.now.to_i}",
         vmid: next_vmid,
         type: 'qemu',
-        node_id: node_id,
+        node_id: default_node_id,
         cores: 1,
         sockets: 1,
         kvm: 1,
@@ -117,14 +129,14 @@ module ForemanFogProxmox
         name: "foreman_#{Time.now.to_i}",
         vmid: next_vmid,
         type: 'lxc',
-        node_id: node_id,
+        node_id: default_node_id,
         memory: 512 * MEGA,
         templated: 0
       ).merge(Fog::Proxmox::DiskHelper.flatten(volume_container_defaults)).merge(Fog::Proxmox::DiskHelper.flatten(volume_server_defaults)).merge(Fog::Proxmox::NicHelper.flatten(interface_defaults))
     end
 
     def vm_instance_defaults
-      super.merge(vmid: next_vmid, node_id: node_id)
+      super.merge(vmid: next_vmid, node_id: default_node_id)
     end
 
     def new_vm(new_attr = {})
@@ -143,7 +155,9 @@ module ForemanFogProxmox
 
     def new_container_vm(new_attr = {})
       options = new_attr
-      options = options.merge(node_id: node_id).merge(type: 'lxc').merge(vmid: next_vmid)
+      node_id = new_attr['node_id']
+      node = node_id ? client.nodes.get(node_id) : default_node
+      options = options.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(format(_('new_container_vm() vm.config=%<config>s'), config: vm.config.inspect))
@@ -152,7 +166,9 @@ module ForemanFogProxmox
 
     def new_server_vm(new_attr = {})
       options = new_attr
-      options = options.merge(node_id: node_id).merge(type: 'qemu').merge(vmid: next_vmid)
+      node_id = new_attr['node_id']
+      node = node_id ? client.nodes.get(node_id) : default_node
+      options = options.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(format(_('new_server_vm() vm.config=%<config>s'), config: vm.config.inspect))

data/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb

@@ -19,10 +19,6 @@
 
 module ForemanFogProxmox
   module ProxmoxVmQueries
-    def next_vmid
-      node.servers.next_id
-    end
-
     def nodes
       nodes = client.nodes.all if client
       nodes&.sort_by(&:node)
@@ -33,19 +29,25 @@ module ForemanFogProxmox
       pools.sort_by(&:poolid)
     end
 
-    def storages(type = 'images')
+    def storages(node_id = default_node_id, type = 'images')
+      node = client.nodes.get node_id
+      node ||= default_node
       storages = node.storages.list_by_content_type type
       storages.sort_by(&:storage)
     end
 
-    def bridges
+    def bridges(node_id = default_node_id)
       node = network_client.nodes.get node_id
+      node ||= network_client.nodes.first
       bridges = node.networks.all(type: 'any_bridge')
       bridges.sort_by(&:iface)
     end
 
+    # TODO: Pagination with filters
     def vms(_opts = {})
-      node
+      vms = []
+      nodes.each { |node| vms += node.servers.all + node.containers.all }
+      ForemanFogProxmox::Vms.new(vms)
     end
 
     def find_vm_by_uuid(uuid)

data/app/models/foreman_fog_proxmox/vms.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 ForemanFogProxmox
+  class Vms
+    attr_reader :items
+
+    def each
+      @items.each
+    end
+
+    # TODO: Pagination with filters
+    def all(_filters = {})
+      items
+    end
+
+    def initialize(items = [])
+      @items = items
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# 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/new',
+  :name => 'add_vm_type_to_networks_form',
+  :replace => "erb[loud]:contains('compute_resources_vms/form/networks')",
+  :partial => 'compute_resources_vms/form/proxmox/add_vm_type_node_to_new_form',
+  :original => '10d73563b7c13f01702aadfffd95956da8bff1ad',
+  :namespaced => true
+)

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

@@ -18,7 +18,6 @@ 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 %>
-<% node_id = !!f.object.node_id ? f.object.node_id : '' %>
 <% 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}") %>
@@ -28,4 +27,3 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= 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/show/_proxmox.html.erb

@@ -31,3 +31,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <td><%= _("Token expires on") %></td>
   <td><%= @compute_resource.token_deadline%></td>
 </tr>
+<tr>
+  <td><%= _("Cluster nodes") %></td>
+  <td><%= @compute_resource.nodes.collect { |node| node.node }%></td>
+</tr>

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

@@ -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/>. %>
+<% if compute_resource.class == ForemanFogProxmox::Proxmox %>
+    <% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
+    <% node_id = f.object.respond_to?('node_id') ? f.object.node_id : nil %>
+
+    <%= render :partial => 'compute_resources_vms/form/networks', :locals => { :f => f, :compute_resource => @compute_resource, :new_host => true, :new_vm => true, :item_layout => 'removable', :vm_type => vm_type, :node_id => node_id } %>
+<% else %>
+    <%= render :partial => 'compute_resources_vms/form/networks', :locals => { :f => f, :compute_resource => @compute_resource, :new_host => true, :new_vm => true, :item_layout => 'removable' } %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_networks_form.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 %>
 <% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
+<% node_id = f.object.respond_to?('node_id') ? f.object.node_id : nil %>
 
 <%= 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 },
+              :locals => { :f => i, :vm_type => vm_type, :node_id => node_id, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface'), :selected_cluster => selected_cluster },
               :layout => 'compute_resources_vms/form/deletable_layout' %>
 <% else %>
 <%= render :partial => provider_partial(compute_resource, 'network'),

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_networks_new_childs_form.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/>. %>
 <% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
+<% node_id = f.object.respond_to?('node_id') ? f.object.node_id : nil %>
 
 <%= new_child_fields_template(f, compute_resource.interfaces_attrs_name, {
         :object => compute_resource.new_interface,
         :partial => provider_partial(compute_resource, 'network'),
-        :form_builder_attrs => { :vm_type => vm_type, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface') },
+        :form_builder_attrs => { :vm_type => vm_type, :node_id => node_id, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface') },
         :layout => 'compute_resources_vms/form/deletable_layout' }) %>
 <% else %>
 <%= new_child_fields_template(f, compute_resource.interfaces_attrs_name, {

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

@@ -16,10 +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/>. %>
 <% if @host.compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% compute_attributes = f.object.compute_attributes %>
-<% vm_type = compute_attributes ? compute_attributes['type'] : f.object.type %>
+<% vm_type = vm_type(@host) %>
+<% node_id = node_id(@host) %>
 
 <%= 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 %>
+    <%= 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 %>
 <%= f.fields_for 'compute_attributes', OpenStruct.new(f.object.compute_attributes) do |f| %>

data/app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_volumes_edit.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/>. %>
 <% if compute_resource.class == ForemanFogProxmox::Proxmox %>
 <% type = f.object.type %>
+<% node_id = f.object.node_id %>
 <% server = type == 'qemu' %>
 <% container = type == 'lxc' %>
 
@@ -23,13 +24,13 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
               :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') },
+              :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, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage 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" }) %>
 
 
@@ -37,15 +38,15 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= 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, :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" %>
+                <%= 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, :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" %>
+                <%= 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, :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" %>
+                <%= 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>
             <% end %> 
     <% end %>  

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

@@ -18,7 +18,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_vm', "data-turbolinks-track" => true %>
 <%= javascript_tag("$(document).on('ContentLoad', tfm.numFields.initAll)"); %>
 
-<%= select_f f, :type, proxmox_types_map, :id, :name, { }, :label => _('Type'), :label_size => "col-md-2", :onchange => "vmTypeSelected()", :disabled => !new_vm %>
+<%= select_f f, :type, proxmox_types_map, :id, :name, { }, :label => _('Type'), :label_size => "col-md-2", :required => true, :onchange => "vmTypeSelected()", :disabled => !new_vm %>
 
 <!-- VM General Settings -->
 <%= render :partial => "compute_resources_vms/form/proxmox/general", :locals => { :f => f, :compute_resource =>  compute_resource, :new_vm => new_vm, :from_profile => from_profile } %>
@@ -32,8 +32,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <!-- 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 } %>
+  <%= 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 } %>
 <% end %>
 <%= f.fields_for :config, compute_resource.new_container_vm(object_to_config_hash(f.object)).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 } %>
+  <%= 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/_general.html.erb

@@ -20,7 +20,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= field_set_tag _("General"), :id => "general" do %>
   <%= checkbox_f f, :templated, :label => _('Create image?'), :disabled => untemplatable, :class => ('hide' if untemplatable), :no_label => untemplatable %>
   <%= counter_f f, :vmid, :label => _('VM ID'), :label_size => "col-md-2", :required => true, :disabled => (!new_vm || from_profile) %>
-  <%= select_f f, :node_id, compute_resource.nodes, :node, :node, { }, :label => _('Node'), :label_size => "col-md-2", :required => true, :disabled => true %>
+  <%= select_f f, :node_id, compute_resource.nodes, :node, :node, { }, :label => _('Node'), :label_size => "col-md-2", :required => true, :onchange => 'nodeSelected(this)' %>
+  <%= checkbox_f f, :start_after_create, :label => _('Start after creation?'), :disabled => !new_vm, :class => ('hide' if !new_vm), :no_label => !new_vm %>
   <% unless local_assigns[:hide_image] && !new_vm %>
     <%
       arch ||= nil ; os ||= nil

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

@@ -15,5 +15,5 @@ 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/>. %>
 
-<%= render :partial => "compute_resources_vms/form/proxmox/server/network", :locals => { :f => f, :type => vm_type, :compute_resource =>  compute_resource, :new_vm => new_vm } %>
-<%= render :partial => "compute_resources_vms/form/proxmox/container/network", :locals => { :f => f, :type => vm_type, :compute_resource =>  compute_resource, :new_vm => new_vm } %>
+<%= render :partial => "compute_resources_vms/form/proxmox/server/network", :locals => { :f => f, :vm_type => vm_type, :node_id => node_id, :compute_resource =>  compute_resource, :new_vm => new_vm } %>
+<%= render :partial => "compute_resources_vms/form/proxmox/container/network", :locals => { :f => f, :vm_type => vm_type, :node_id => node_id, :compute_resource =>  compute_resource, :new_vm => new_vm } %>

data/app/views/compute_resources_vms/form/proxmox/container/_extended.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 = f.object.type == 'lxc' %>  
+<% node_id = f.object.node_id %>  
 
 <%= field_set_tag _("Extended"), :id => "container_config_ext", :class => ('hide' unless (new_vm && container)), :disabled => (!container || !new_vm) do %>
   <div id="ostemplate_form">
-    <%= select_f f, :ostemplate_storage, compute_resource.storages('vztmpl'), :storage, :storage, { :include_blank => true }, :disabled => !new_vm, :class => ('hide' unless new_vm), :label => _('Template storage'), :label_size => "col-md-2", :onchange => 'storageOstemplateSelected(this)' %>
-    <%= select_f f, :ostemplate_file, compute_resource.images_by_storage(f.object.ostemplate_storage, 'vztmpl'), :volid, :volid, { :include_blank => true }, :disabled => !new_vm, :class => ('hide' unless new_vm), :label => _('OS Template'), :label_size => "col-md-2", :required => true %>
+    <%= select_f f, :ostemplate_storage, compute_resource.storages(node_id,'vztmpl'), :storage, :storage, { :include_blank => true }, :disabled => !new_vm, :class => ('hide' unless new_vm), :label => _('Template storage'), :label_size => "col-md-2", :onchange => 'storageOstemplateSelected(this)' %>
+    <%= select_f f, :ostemplate_file, compute_resource.images_by_storage(node_id,f.object.ostemplate_storage, 'vztmpl'), :volid, :volid, { :include_blank => true }, :disabled => !new_vm, :class => ('hide' unless new_vm), :label => _('OS Template'), :label_size => "col-md-2", :required => true %>
   </div>
   <%= password_proxmox_f f, :password, :label => _("Root password"), :required => true %>
 <% end %>

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

@@ -15,9 +15,10 @@ 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/>. %>
 
-<% container = type == 'lxc' %>
+<% container = vm_type == 'lxc' %>
+<% index = f.index ? f.index.present? : 0 %>
 
-<%= field_set_tag _("Nic"), :id => "container_network_#{f.index}", :style => ('display: none;' unless container), :disabled => !container do %>  
+<%= 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') %>
@@ -28,5 +29,5 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= text_f f, :gwv6, :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" %>
-    <%= select_f f, :bridge, compute_resource.bridges, :iface, :iface, { }, :label => _('Bridge'), :label_size => "col-md-2" %>
+    <%= 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/container/_volume_mp.html.erb

@@ -20,7 +20,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <%= 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" %>
+    <%= select_f f, :storage, compute_resource.storages(node_id), :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/") %>
     <%= text_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" %>

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

@@ -19,6 +19,6 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <%= 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" %>
+    <%= select_f f, :storage, compute_resource.storages(node_id), :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/_config.html.erb

@@ -51,7 +51,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= radio_button_f f, :cdrom, :value => 'cdrom' , :text => _('Physical'), :onclick => 'cdromSelected(this)' %>
   <%= radio_button_f f, :cdrom, :value => 'image' , :text => _('Image'), :onclick => 'cdromSelected(this)' %>
   <div id='cdrom_image_form' class='<%= 'hide' if %[none cdrom].include? f.object.cdrom %>'>
-    <%= select_f f, :cdrom_storage, compute_resource.storages('iso'), :storage, :storage, { :include_blank => true }, :label => _('Storage'), :label_size => "col-md-2", :onchange => 'storageIsoSelected(this)' %>
+    <%= select_f f, :cdrom_storage, compute_resource.storages(node_id,'iso'), :storage, :storage, { :include_blank => true }, :label => _('Storage'), :label_size => "col-md-2", :onchange => 'storageIsoSelected(this)' %>
     <%= select_f f, :cdrom_iso, compute_resource.images_by_storage(f.object.cdrom_storage, 'iso'), :volid, :volid, { :include_blank => true }, :label => _('Image ISO'), :label_size => "col-md-2" %>
   </div>
 <% end %>

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

@@ -15,12 +15,13 @@ 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/>. %>
 
-<% server = type == 'qemu' %>
+<% server = vm_type == 'qemu' %>
+<% index = f.index ? f.index.present? : 0 %>
 
-<%= field_set_tag _("Nic"), :id => "server_network_#{f.index}", :style => ('display: none;' unless server), :disabled => !server do %> 
+<%= field_set_tag _("Nic"), :id => "server_network_#{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" %>
+    <%= select_f f, :bridge, compute_resource.bridges(node_id), :iface, :iface, { }, :label => _('Bridge'), :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" %>
     <%= counter_f f, :queues, :class => "input-mini", :label => _('Multiqueue'), :label_size => "col-md-2" %>

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

@@ -20,7 +20,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <%= 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" %>
+    <%= 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)' %>
     <%= select_f f, :cache, proxmox_caches_map, :id, :name, { include_blank: true }, :label => _('Cache'), :label_size => "col-md-2" %>

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

@@ -19,6 +19,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <thead>
   <tr>
     <th><%= _('Name') -%></th>
+    <th><%= _('Node') -%></th>
     <th><%= _('Type') -%></th>
     <th><%= _('CPUs') -%></th>
     <th><%= _('Memory') -%></th>
@@ -31,9 +32,10 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <% @vms.each do |vm| -%>
       <tr>
         <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity) %></td>
+        <td><%= vm.node_id %></td>
         <td><%= vm.type %></td>
-        <td><%= vm.maxcpu %></td>
-        <td><%= (vm.maxmem.to_i / (1024 * 1024)).to_s %> MB</td>
+        <td><%= vm.cpus %></td>
+        <td><%= Fog::Proxmox::DiskHelper.to_human_bytes(vm.maxmem) %></td>
         <td> <span <%= vm_power_class(vm.ready?) %>> <%= vm_state(vm) %></span> </td>
         <td><%= vm.uptime %></td>
         <td>