foreman_fog_proxmox 0.12.4 → 0.13.0

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 %>

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

@@ -18,19 +18,19 @@ 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' %>
+<% logger.debug("_config.html.erb server_config=#{f.object.inspect}") %>
 
 <%= field_set_tag n_("Main option", "Main options", 2), :id => "server_config_options", :class => 'hide', :disabled => !server do %>
   <%= textarea_f f, :description, :label => _('Description'), :label_size => "col-md-2" %>
-  <%= text_f f, :boot, :label => _('Boot device order'), :label_size => "col-md-2", :label_help => _('Floppy disk (a), hard disk (c), cdrom (d), network (n). Default cdn')  %>
+  <%= text_f f, :boot, :label => _('Boot device order'), :label_size => "col-md-2", :label_help => _('Order your devices, e.g. order=net0;ide2;scsi0. Default empty (any)')  %>
   <%= checkbox_f f, :onboot, :label => _('Start at boot') %>
   <%= checkbox_f f, :agent, :label => _('Qemu Agent') %>
   <%= checkbox_f f, :kvm, :label => _('KVM'), :label_help => _('Enable/disable KVM hardware virtualization') %>
-  <%= select_f f, :keyboard, proxmox_keyboards_map, :id,  :name, { }, :label => _('Keyboard'), :label_size => "col-md-2" %>
   <%= select_f f, :vga, proxmox_vgas_map, :id, :name, { :include_blank => true }, :label => _('VGA'), :label_size => "col-md-2" %>
   <%= select_f f, :scsihw, proxmox_scsi_controllers_map, :id, :name, { }, :label => _('SCSI Controller'), :label_size => "col-md-2" %>
   <%= select_f f, :bios, proxmox_bios_map, :id, :name, { }, :label => _('BIOS'), :label_size => "col-md-2" %>
 <% end %>
-<%= field_set_tag _("CPU"), :id => "server_config_cpu", :class => 'hide', :disabled => !server do %>
+<%= field_set_tag _("CPUs"), :id => "server_config_cpu", :class => 'hide', :disabled => !server do %>
   <%= select_f f, :cpu_type, proxmox_cpus_map, :id, :name, { }, :label => _('Type'), :label_size => "col-md-2" %>
   <%= counter_f f, :sockets, :class => "input-mini", :label => _('Sockets'), :label_size => "col-md-2" %>
   <%= counter_f f, :cores, :class => "input-mini", :label => _('Cores'), :label_size => "col-md-2" %>
@@ -38,23 +38,24 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= counter_f f, :cpulimit, :class => "input-mini", :label => _('CPU limit'), :label_size => "col-md-2" %>
   <%= counter_f f, :cpuunits, :class => "input-mini", :label => _('CPU units'), :label_size => "col-md-2" %>
   <%= checkbox_f f, :numa, :label => _('Enable NUMA') %>
-  <%= checkbox_f f, :pcid, :label => _('PCID') %>
-  <%= checkbox_f f, :spectre, :label => _('Spectre-CTRL') %>
+  <%= field_set_tag _("CPU Flags"), :id => "server_config_cpu_flags" do %>
+    <% Fog::Proxmox::CpuHelper.flags.each do |flag_key, flag_value| %>
+      <%= select_f f, flag_key, proxmox_cpu_flags_map, :id, :name, { }, :label => _(flag_value) %>
+    <% end %>
+  <% end %>
 <% end %>
 <%= field_set_tag _("Memory"), :id => "server_config_memory", :class => 'hide', :disabled => !server do %>
   <%= byte_size_f f, :memory, :class => "input-mini", :label => _('Memory'), :label_size => "col-md-2" %>
   <%= byte_size_f f, :balloon, :class => "input-mini", :label => _('Minimum memory'), :label_size => "col-md-2" %>
   <%= counter_f f, :shares, :class => "input-mini", :label => _('Shares'), :label_size => "col-md-2" %>
 <% end %>
-<%= field_set_tag _("CD-ROM"), :id => "server_config_cdrom", :class => 'hide', :disabled => !server do %>
-  <%= radio_button_f f, :cdrom, :value => 'none', :text => _('None'), :onclick => 'cdromSelected(this)' %>
-  <%= 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(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 %>
 <%= field_set_tag _("Operating System"), :id => "server_config_os", :class => 'hide', :disabled => !server do %>
   <%= select_f f, :ostype, proxmox_operating_systems_map, :id, :name, { :include_blank => true }, :label => _('OS type'), :label_size => "col-md-2" %>
+<% end %>
+<%= field_set_tag _("Cloud-init"), :id => "server_config_cloud_init", :class => ('hide' unless cloudinit), :disabled => (!cloudinit) do %>
+  <%= text_f f, :ciuser, :label => _('User'), :label_size => "col-md-2" %>
+  <%= text_f f, :cipassword, :label => _('Password'), :label_size => "col-md-2" %>
+  <%= text_f f, :searchdomain, :label => _('DNS domain'), :label_size => "col-md-2" %>
+  <%= text_f f, :nameserver, :label => _('DNS servers'), :label_size => "col-md-2" %>
+  <%= textarea_f f, :sshkeys, :label => _("SSH public key"), :size => "col-md-4" %>
 <% end %>

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

@@ -25,6 +25,6 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     <%= 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" %>
-    <%= checkbox_f f, :firewall, :label => _('Firewall') %>
-    <%= checkbox_f f, :link_down, :label => _('Disconnect') %>
+    <%= checkbox_f f, :firewall, { :label => _('Firewall') }, '1', '0' %>
+    <%= checkbox_f f, :link_down, { :label => _('Disconnect') }, '1', '0' %>
 <% end %>

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

@@ -0,0 +1,34 @@
+<%# 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/>. %>
+
+<%= javascript_include_tag 'foreman_fog_proxmox/proxmox_volume_cdrom', "data-turbolinks-track" => true %>
+
+<% cdrom = f.object.cdrom? %>
+<% new_volume = f.object.volid.nil? %>
+
+<%= field_set_tag _("CD-ROM"), :id => "server_volume_cdrom_#{f.index}", :class => ('hide' unless cdrom), :disabled => !cdrom do %>
+  <%= field_set_tag _("Media"), :id => "cdrom_media_form_#{f.index}" do %>
+    <%= f.hidden_field :storage_type %>
+    <%= radio_button_f f, :cdrom, :value => 'none', :text => _('None'), :onclick => 'cdromSelected(this)' %>
+    <%= radio_button_f f, :cdrom, :value => 'cdrom' , :text => _('Physical'), :onclick => 'cdromSelected(this)' %>
+    <%= radio_button_f f, :cdrom, :value => 'image' , :text => _('Image'), :onclick => 'cdromSelected(this)' %>
+  <% end %>
+  <%= field_set_tag _("Image"), :id => "cdrom_image_form_#{f.index}", :class => ('hide' unless %[image].include? f.object.cdrom), :disabled => (%[cdrom none].include? f.object.cdrom)  do %>
+    <%= select_f f, :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, :volid, compute_resource.images_by_storage(node_id, f.object.storage, 'iso'), :volid, :volid, { :include_blank => true }, :label => _('Image ISO'), :label_size => "col-md-2" %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,29 @@
+<%# 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/>. %>
+
+<%= javascript_include_tag 'foreman_fog_proxmox/proxmox_volume_cloudinit', "data-turbolinks-track" => true %>
+
+<% cloud_init = f.object.cloud_init? %>
+<% new_volume = f.object.volid.nil? %>
+
+<%= field_set_tag _("Cloud-init"), :id => "server_volume_cloud_init_#{f.index}", :class => ('hide' unless cloud_init), :disabled => !cloud_init do %>
+  <%= f.hidden_field :volid if !new_volume %>
+  <%= f.hidden_field :storage_type %>
+  <%= select_f f, :storage, compute_resource.storages(node_id), :storage, :storage, { :include_blank => true }, :label => _('Storage'), :label_size => "col-md-2", :disabled => !new_volume %>
+  <%= select_f f, :controller, proxmox_controllers_cloudinit_map, :id, :name, { :include_blank => true }, :label => _('Controller'), :label_size => "col-md-2", :onchange => 'cloudinitControllerSelected(this)', :disabled => !new_volume %>
+  <%= text_f f, :device, :label => _('Device'), :label_size => "col-md-2", :'data-min' => 0, :'data-soft-max' => proxmox_max_device(f.object.controller), :disabled => !new_volume %>
+<% end %>

data/app/views/compute_resources_vms/form/proxmox/server/{_volume.html.erb → _volume_hard_disk.html.erb}

@@ -15,11 +15,15 @@ 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' %>
+<% hard_disk = f.object.hard_disk? %>
+<% logger.debug("_volume_hard_disk.html f.object=#{f.object.inspect}") %>
+<% logger.debug("_volume_hard_disk.html f.object.hard_disk?=#{f.object.hard_disk?}") %>
+<% logger.debug("_volume_hard_disk.html f.object.storage_type=#{f.object.storage_type}") %>
 <% 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 %>
+<%= field_set_tag _('Hard disk'), :id => "server_volume_hard_disk_#{f.index}", :class => ('hide' unless hard_disk), :disabled => !hard_disk do %> 
+    <%= f.hidden_field :volid if !new_volume %>    
+    <%= f.hidden_field :storage_type %>
     <%= select_f f, :storage, compute_resource.storages(node_id), :storage, :storage, { }, :label => _('Storage'), :label_size => "col-md-2" %>
     <%= select_f f, :controller, proxmox_controllers_map, :id, :name, { }, :label => _('Controller'), :label_size => "col-md-2", :disabled => !new_volume, :onchange => 'controllerSelected(this)' %>
     <%= text_f f, :device, :label => _('Device'), :label_size => "col-md-2", :disabled => !new_volume, :'data-min' => 0, :'data-soft-max' => proxmox_max_device(f.object.controller), :onchange => 'deviceSelected(this)' %>

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

@@ -30,6 +30,8 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
       <%= prop :memory %>
       <% unless @vm.container? %>
         <%= prop :vga %>
+        <%= prop :cloud_init? %>
+        <%= prop :cdrom? %>
       <% end %>
       <%= prop :cpus %>
       <%= prop :uptime %>

data/lib/foreman_fog_proxmox/engine.rb

@@ -84,18 +84,17 @@ module ForemanFogProxmox
     end
 
     config.to_prepare do
-      require 'fog/compute/proxmox/models/server'
-      require 'fog/compute/proxmox/models/server_config'
-      require 'fog/compute/proxmox/models/disk'
-      require 'fog/compute/proxmox/models/interface'
-      require 'fog/compute/proxmox/models/volume'
-      require 'fog/compute/proxmox/models/node'
+      require 'fog/proxmox/compute/models/server'
+      require 'fog/proxmox/compute/models/server_config'
+      require 'fog/proxmox/compute/models/disk'
+      require 'fog/proxmox/compute/models/interface'
+      require 'fog/proxmox/compute/models/volume'
+      require 'fog/proxmox/compute/models/node'
 
       Fog::Proxmox::Compute::Server.include FogExtensions::Proxmox::Server
       Fog::Proxmox::Compute::ServerConfig.include FogExtensions::Proxmox::ServerConfig
-      Fog::Proxmox::Compute::Disk.include FogExtensions::Proxmox::Disk
       Fog::Proxmox::Compute::Interface.include FogExtensions::Proxmox::Interface
-      Fog::Proxmox::Compute::Volume.include FogExtensions::Proxmox::Volume
+      Fog::Proxmox::Compute::Disk.include FogExtensions::Proxmox::Disk
       ::ComputeResourcesController.include ForemanFogProxmox::Controller::Parameters::ComputeResource
       Fog::Proxmox::Compute::Node.include FogExtensions::Proxmox::Node
       ::Host::Managed.include Orchestration::Proxmox::Compute

data/lib/foreman_fog_proxmox/hash_collection.rb

@@ -0,0 +1,69 @@
+# 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/>.
+
+require 'foreman_fog_proxmox/value'
+
+module ForemanFogProxmox
+  module HashCollection
+    def self.add_and_format_element(dest, dest_key, origin, origin_key, format = :to_s)
+      dest[dest_key] = origin[origin_key].send(format) if origin && origin[origin_key]
+    end
+
+    def self.remove_empty_values(h)
+      h.delete_if { |_key, value| ForemanFogProxmox::Value.empty?(value) }
+    end
+
+    def self.remove_keys(h, excluded_keys)
+      h.delete_if { |key, _value| excluded_keys.include?(key) }
+    end
+
+    def self.new_hash_reject_keys(h, excluded_keys)
+      h.reject { |key, _value| excluded_keys.include?(key) }
+    end
+
+    def self.new_hash_reject_empty_values(h)
+      h.reject { |_key, value| ForemanFogProxmox::Value.empty?(value) }
+    end
+
+    def self.new_hash_transform_values(h, transformation)
+      h.transform_values { |value| value.send(transformation) }
+    end
+
+    def self.equals?(h1, h2)
+      new_h1 = new_hash_transform_values(h1, :to_s)
+      new_sorted_h1 = new_h1.sort_by { |key, _value| key }.to_h
+      new_h2 = new_hash_transform_values(h2, :to_s)
+      new_sorted_h2 = new_h2.sort_by { |key, _value| key }.to_h
+      new_sorted_h1.keys == new_sorted_h2.keys && new_sorted_h1.values == new_sorted_h2.values
+    end
+
+    def self.stringify_keys(old_h)
+      h = old_h.map do |k, v|
+        v_str = if v.instance_of? Hash
+                  v.stringify_keys
+                else
+                  v
+                end
+
+        [k.to_s, v_str]
+      end
+      Hash[h]
+    end
+  end
+end