foreman_fog_proxmox 0.10.1 → 0.12.1

data/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb

@@ -19,16 +19,13 @@
 
 module ForemanFogProxmox
   module ProxmoxVmQueries
+    include ProxmoxPools
+
     def nodes
       nodes = client.nodes.all if client
       nodes&.sort_by(&:node)
     end
 
-    def pools
-      pools = identity_client.pools.all
-      pools.sort_by(&:poolid)
-    end
-
     def storages(node_id = default_node_id, type = 'images')
       node = client.nodes.get node_id
       node ||= default_node
@@ -65,12 +62,14 @@ module ForemanFogProxmox
     end
 
     def find_vm_in_servers_by_uuid(servers, uuid)
-      servers.get(uuid) if !uuid.nil? && !uuid.to_s.empty?
+      vm = servers.get(uuid) if !uuid.nil? && !uuid.to_s.empty?
+      pool_owner(vm) if vm
+      vm
     rescue Fog::Errors::NotFound
       nil
     rescue StandardError => e
       Foreman::Logging.exception(format(_('Failed retrieving proxmox server vm by vmid=%<vmid>s'), vmid: uuid), e)
-      raise(ActiveRecord::RecordNotFound)
+      raise(ActiveRecord::RecordNotFound, e)
     end
   end
 end

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

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

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

@@ -16,8 +16,8 @@ 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 = vm_type(@host) %>
-<% node_id = node_id(@host) %>
+<% vm_type = f.object.respond_to?('type') ? f.object.type : nil %>
+<% 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| %>
     <%= 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 %>

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

@@ -35,4 +35,5 @@ along with ForemanFogProxmox. If not, see . %>
       :label_size => "col-md-2" %>
     </div>
   <% end %>
+  <%= select_f f, :pool, compute_resource.pools, :poolid, :poolid, { :include_blank => true }, :label => _('Pool'), :label_size => "col-md-2", :required => false %>
 <% end %>

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

@@ -27,6 +27,8 @@ along with ForemanFogProxmox. If not, see . %>
   <%= 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 %>
   <%= select_f f, :cpu_type, proxmox_cpus_map, :id, :name, { }, :label => _('Type'), :label_size => "col-md-2" %>
@@ -40,11 +42,9 @@ along with ForemanFogProxmox. If not, see . %>
   <%= checkbox_f f, :spectre, :label => _('Spectre-CTRL') %>
 <% end %>
 <%= field_set_tag _("Memory"), :id => "server_config_memory", :class => 'hide', :disabled => !server do %>
-  <% ballooned = f.object.balloon == 1 %>
   <%= byte_size_f f, :memory, :class => "input-mini", :label => _('Memory'), :label_size => "col-md-2" %>
-  <%= byte_size_f f, :min_memory, :class => "input-mini", :label => _('Minimum memory'), :label_size => "col-md-2", :disabled => !ballooned %>
-  <%= counter_f f, :shares, :class => "input-mini", :label => _('Shares'), :label_size => "col-md-2", :disabled => !ballooned %>
-  <%= checkbox_f f, :balloon, :label => _('Ballooning Device'), :onchange => 'balloonSelected(this)' %>
+  <%= 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)' %>

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

@@ -26,6 +26,7 @@ along with ForemanFogProxmox. If not, see . %>
       <%= prop :type %>
       <%= prop :node_id %>
       <%= prop :templated? %>
+      <%= prop :pool %>
       <%= prop :memory %>
       <% unless @vm.container? %>
         <%= prop :vga %>

data/lib/foreman_fog_proxmox/engine.rb

@@ -45,8 +45,8 @@ module ForemanFogProxmox
         # add dashboard widget
         widget 'foreman_fog_proxmox_widget', name: N_('Foreman Fog Proxmox widget'), sizex: 8, sizey: 1
         security_block :foreman_fog_proxmox do
-          permission :view_compute_resource, 'foreman_fog_proxmox/compute_resources' =>
-          [:ostemplates_by_node_and_storage, :isos_by_node_and_storage, :ostemplates_by_node, :isos_by_node, :storages_by_node, :iso_storages_by_node, :bridges_by_node]
+          permission :view_compute_resource, { :'foreman_fog_proxmox/compute_resources' =>
+          [:ostemplates_by_node_and_storage, :isos_by_node_and_storage, :ostemplates_by_node, :isos_by_node, :storages_by_node, :iso_storages_by_node, :bridges_by_node] }
         end
       end
     end

data/lib/foreman_fog_proxmox/version.rb

@@ -18,5 +18,5 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ForemanFogProxmox
-  VERSION = '0.10.1'
+  VERSION = '0.12.1'
 end

data/locale/en/foreman_fog_proxmox.po

@@ -32,9 +32,6 @@ msgstr ""
 msgid "Average load (x100)"
 msgstr ""
 
-msgid "Ballooning Device"
-msgstr ""
-
 msgid "Boot device order"
 msgstr ""
 
@@ -238,6 +235,9 @@ msgstr ""
 msgid "Physical"
 msgstr ""
 
+msgid "Pool"
+msgstr ""
+
 msgid "Power"
 msgstr ""
 
@@ -265,6 +265,9 @@ msgstr ""
 msgid "Rootfs"
 msgstr ""
 
+msgid "SCSI Controller"
+msgstr ""
+
 msgid "SSL verify peer"
 msgstr ""
 
@@ -349,6 +352,9 @@ msgstr ""
 msgid "add new storage volume"
 msgstr ""
 
+msgid "add_vm_to_pool(%<poolid>s, %<vmid>s)"
+msgstr ""
+
 msgid "create_vm(): clone %<image_id>s in %<vmid>s"
 msgstr ""
 
@@ -364,6 +370,9 @@ msgstr ""
 msgid "failed to create vm: %<e>s"
 msgstr ""
 
+msgid "found vm: %<vmid>s member of pool: %<poolid>s"
+msgstr ""
+
 msgid "invalid vmid=%<vmid>s"
 msgstr ""
 
@@ -376,11 +385,17 @@ msgstr ""
 msgid "new_vm() vm.config=%<config>s"
 msgstr ""
 
+msgid "pool_owner(%<vmid>s)"
+msgstr ""
+
 msgid "remove network interface"
 msgstr ""
 
 msgid "remove storage volume"
 msgstr ""
 
+msgid "remove_vm_from_pool(%<poolid>s, %<vmid>s)"
+msgstr ""
+
 msgid "vmid of template vm."
 msgstr ""

data/locale/foreman_fog_proxmox.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_fog_proxmox 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-11 09:46+0100\n"
-"PO-Revision-Date: 2020-02-11 09:46+0100\n"
+"POT-Creation-Date: 2020-05-11 16:25+0200\n"
+"PO-Revision-Date: 2020-05-11 16:25+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -66,6 +66,22 @@ msgstr ""
 msgid "create_vm(): clone %<image_id>s in %<vmid>s"
 msgstr ""
 
+#: ../app/models/foreman_fog_proxmox/proxmox_pools.rb:28
+msgid "pool_owner(%<vmid>s)"
+msgstr ""
+
+#: ../app/models/foreman_fog_proxmox/proxmox_pools.rb:31
+msgid "found vm: %<vmid>s member of pool: %<poolid>s"
+msgstr ""
+
+#: ../app/models/foreman_fog_proxmox/proxmox_pools.rb:36
+msgid "add_vm_to_pool(%<poolid>s, %<vmid>s)"
+msgstr ""
+
+#: ../app/models/foreman_fog_proxmox/proxmox_pools.rb:42
+msgid "remove_vm_from_pool(%<poolid>s, %<vmid>s)"
+msgstr ""
+
 #: ../app/models/foreman_fog_proxmox/proxmox_version.rb:25
 msgid "Proxmox compute resource version is %<version>s"
 msgstr ""
@@ -74,11 +90,11 @@ msgstr ""
 msgid "Proxmox version %<version>s is not semver suitable"
 msgstr ""
 
-#: ../app/models/foreman_fog_proxmox/proxmox_vm_commands.rb:34
+#: ../app/models/foreman_fog_proxmox/proxmox_vm_commands.rb:35
 msgid "invalid vmid=%<vmid>s"
 msgstr ""
 
-#: ../app/models/foreman_fog_proxmox/proxmox_vm_commands.rb:53
+#: ../app/models/foreman_fog_proxmox/proxmox_vm_commands.rb:54
 msgid "failed to create vm: %<e>s"
 msgstr ""
 
@@ -94,7 +110,7 @@ msgstr ""
 msgid "new_server_vm() vm.config=%<config>s"
 msgstr ""
 
-#: ../app/models/foreman_fog_proxmox/proxmox_vm_queries.rb:72
+#: ../app/models/foreman_fog_proxmox/proxmox_vm_queries.rb:71
 msgid "Failed retrieving proxmox server vm by vmid=%<vmid>s"
 msgstr ""
 
@@ -186,7 +202,7 @@ msgid "add new storage volume"
 msgstr ""
 
 #: ../app/views/compute_resources_vms/form/proxmox/_base.html.erb:6
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:17
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:18
 #: ../app/views/compute_resources_vms/index/_proxmox.html.erb:8
 msgid "Type"
 msgstr ""
@@ -213,10 +229,14 @@ msgid "Start after creation?"
 msgstr ""
 
 #: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:19
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:37
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:36
 msgid "Image"
 msgstr ""
 
+#: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:23
+msgid "Pool"
+msgstr ""
+
 #:
 #: ../app/views/compute_resources_vms/form/proxmox/container/_advanced.html.erb:5
 #: ../app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb:5
@@ -237,7 +257,7 @@ msgstr[1] ""
 #: ../app/views/compute_resources_vms/form/proxmox/container/_advanced.html.erb:8
 #: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:9
 #: ../app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb:8
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:16
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:17
 msgid "CPU"
 msgstr ""
 
@@ -246,7 +266,7 @@ msgstr ""
 #: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:15
 #: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:16
 #: ../app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb:10
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:27
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:28
 #: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:29
 #: ../app/views/compute_resources_vms/index/_proxmox.html.erb:10
 msgid "Memory"
@@ -281,19 +301,19 @@ msgstr ""
 
 #:
 #: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:11
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:19
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:20
 msgid "Cores"
 msgstr ""
 
 #:
 #: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:12
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:21
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:22
 msgid "CPU limit"
 msgstr ""
 
 #:
 #: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:13
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:22
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:23
 msgid "CPU units"
 msgstr ""
 
@@ -319,13 +339,13 @@ msgstr ""
 
 #:
 #: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:24
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:43
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:42
 msgid "Operating System"
 msgstr ""
 
 #:
 #: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:25
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:44
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:43
 msgid "OS type"
 msgstr ""
 
@@ -417,7 +437,7 @@ msgstr ""
 #:
 #: ../app/views/compute_resources_vms/form/proxmox/container/_volume_mp.html.erb:8
 #: ../app/views/compute_resources_vms/form/proxmox/container/_volume_rootfs.html.erb:7
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:39
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:38
 #: ../app/views/compute_resources_vms/form/proxmox/server/_volume.html.erb:8
 msgid "Storage"
 msgstr ""
@@ -482,23 +502,27 @@ msgstr ""
 msgid "VGA"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:18
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:15
+msgid "SCSI Controller"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:19
 msgid "Sockets"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:20
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:21
 msgid "VCPUs"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:23
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:24
 msgid "Enable NUMA"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:24
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:25
 msgid "PCID"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:25
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:26
 msgid "Spectre-CTRL"
 msgstr ""
 
@@ -510,23 +534,19 @@ msgstr ""
 msgid "Shares"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:32
-msgid "Ballooning Device"
-msgstr ""
-
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:34
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:33
 msgid "CD-ROM"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:35
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:34
 msgid "None"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:36
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:35
 msgid "Physical"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:40
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:39
 msgid "Image ISO"
 msgstr ""
 

data/locale/fr/foreman_fog_proxmox.po

@@ -32,9 +32,6 @@ msgstr ""
 msgid "Average load (x100)"
 msgstr "Charge moyenne du serveur (x100)"
 
-msgid "Ballooning Device"
-msgstr "Périphérique à gonflement"
-
 msgid "Boot device order"
 msgstr ""
 
@@ -238,6 +235,9 @@ msgstr "Chemin"
 msgid "Physical"
 msgstr "Physique"
 
+msgid "Pool"
+msgstr ""
+
 msgid "Power"
 msgstr "Alimentation"
 
@@ -265,6 +265,9 @@ msgstr "Mot de passe root"
 msgid "Rootfs"
 msgstr ""
 
+msgid "SCSI Controller"
+msgstr ""
+
 msgid "SSL verify peer"
 msgstr ""
 
@@ -349,6 +352,9 @@ msgstr "Autorités de certification X509"
 msgid "add new storage volume"
 msgstr "ajouter un nouveau volume de stockage"
 
+msgid "add_vm_to_pool(%<poolid>s, %<vmid>s)"
+msgstr ""
+
 msgid "create_vm(): clone %<image_id>s in %<vmid>s"
 msgstr ""
 
@@ -364,6 +370,9 @@ msgstr "par exemple root@pam"
 msgid "failed to create vm: %<e>s"
 msgstr "échec à la création de la VM: %<e>s"
 
+msgid "found vm: %<vmid>s member of pool: %<poolid>s"
+msgstr ""
+
 msgid "invalid vmid=%<vmid>s"
 msgstr "vmid=%<vmid>s incorrect"
 
@@ -376,11 +385,17 @@ msgstr ""
 msgid "new_vm() vm.config=%<config>s"
 msgstr ""
 
+msgid "pool_owner(%<vmid>s)"
+msgstr ""
+
 msgid "remove network interface"
 msgstr "retirer l'interface réseau"
 
 msgid "remove storage volume"
 msgstr "retirer le stockage de volume"
 
+msgid "remove_vm_from_pool(%<poolid>s, %<vmid>s)"
+msgstr ""
+
 msgid "vmid of template vm."
 msgstr "vmid de la VM modèle."

data/test/factories/foreman_fog_proxmox/proxmox_node_mock_factory.rb

@@ -75,6 +75,12 @@ module ForemanFogProxmox
       client = mock('client')
       client.stubs(:nodes).returns(nodes)
       cr.stubs(:client).returns(client)
+      identity_client = mock('identity_client')
+      pools = mock('pools')
+      pools.stubs(:select).returns([])
+      pools.stubs(:all).returns([])
+      identity_client.stubs(:pools).returns(pools)
+      cr.stubs(:identity_client).returns(identity_client)
       cr
     end
   end