foreman_fog_proxmox 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 494d9e13c53b6e6e1a4821d8c046d145060bac1058f9285763661bd935e5a4ef
-  data.tar.gz: ba0639aa5659316381788213a3d6049ae98a8238a1612dd1dc8db7eed583d11f
+  metadata.gz: 329a340fdfd2b5e117a05a227477e29108df61d303a5ce5a5a2dc148ae41ec7c
+  data.tar.gz: '08b9aa3dca59fb2b7a80c2f1e6b0b59c9931f0d974e8d9849a720d6d37a819be'
 SHA512:
-  metadata.gz: 4d7e5fc3d3bff0e58256217b5f69910dc03d0f08662dcc2ef1af35e242e5115f4e8023c565afa99cd83821dea73018d66b235354106766a4dbed351266c165ce
-  data.tar.gz: 6ec6c8942c3e58cc7b3a05be5f2c0131bc47a0fb3cb9a4948d46cea8b51610ee33b7b6f0cbd8a08eac66818e7e83a2f0f51e3dca2ce8d0a9c051092d84c21c81
+  metadata.gz: '094a19a8592b2ed3ad7a88c637c7859f3bbc631a4f08f2fb781ec21a8b9620789fb701dbab917973ee122fb2ead5a44d6af12a28fe6dd2d99dad2267c8d051a7'
+  data.tar.gz: ce956eaac9a5faf92f2decd8721910dd72fd9a0e7f0ccfbeab40462c1cfc7892897235e7d2fef925405abf993b85f902edac0f4afcb1ec685649d27df0e61168

data/app/controllers/concerns/foreman_fog_proxmox/controller/parameters/compute_resource.rb

@@ -27,8 +27,7 @@ module ForemanFogProxmox
           def compute_resource_params_filter
             super.tap do |filter|
               filter.permit :ssl_verify_peer,
-                :ssl_certs, :disable_proxy, :auth_method, :token_id, :token,
-                :caching_enabled
+                :ssl_certs, :disable_proxy, :auth_method, :token_id, :token
             end
           end
 

data/app/controllers/foreman_fog_proxmox/compute_resources_controller.rb

@@ -84,8 +84,7 @@ module ForemanFogProxmox
       node_id = params[:node_id]
       storage = params[:storage]
 
-      node = cr.send(:client).nodes.get(node_id)
-      vols = node&.storages&.get(storage)&.volumes || []
+      vols = cr.storages(node_id).find { |s| s.storage == storage }&.volumes || []
 
       render json: Array(vols).map { |v|
         h = v.respond_to?(:as_json) ? v.as_json : v

data/app/models/foreman_fog_proxmox/proxmox.rb

@@ -36,8 +36,6 @@ module ForemanFogProxmox
     include ProxmoxVersion
     include ProxmoxConsole
     include ComputeAttributesUpdateDetector
-    include ComputeResourceCaching
-
     validates :url, :format => { :with => URI::DEFAULT_PARSER.make_regexp }, :presence => true
     validates :auth_method, :presence => true, :inclusion => { in: ['access_ticket', 'user_token'],
       message: ->(value) do format('%<value>s is not a valid authentication method', { value: value }) end }
@@ -131,14 +129,6 @@ module ForemanFogProxmox
 
     private
 
-    def structs_from_cache(items)
-      Array(items).map { |item| OpenStruct.new(item) }
-    end
-
-    def extract_attributes(resource, fields)
-      slice_vm_attributes(fields.index_with { |field| resource.try(field) }, fields)
-    end
-
     def fog_credentials
       hash = {
         proxmox_url: url,

data/app/models/foreman_fog_proxmox/proxmox_images.rb

@@ -24,18 +24,11 @@ module ForemanFogProxmox
     end
 
     def images_by_storage(node_id, storage_id, type = 'iso')
-      cached_images = cache.cache(:"images_by_storage-#{node_id}-#{storage_id}-#{type}") do
-        node = client.nodes.get(node_id) || default_node
-        storage = node.storages.get storage_id if storage_id
-        logger.debug("images_by_storage(): node_id #{node_id} storage_id #{storage_id} type #{type}")
-        next [] unless storage
-
-        storage.volumes.list_by_content_type(type).sort_by(&:volid).map do |volume|
-          extract_attributes(volume, [:volid, :content, :format, :size, :used])
-        end
-      end
-
-      structs_from_cache(cached_images)
+      node = client.nodes.get node_id
+      node ||= default_node
+      storage = node.storages.get storage_id if storage_id
+      logger.debug("images_by_storage(): node_id #{node_id} storage_id #{storage_id} type #{type}")
+      storage.volumes.list_by_content_type(type).sort_by(&:volid) if storage
     end
 
     def template_name(template)
@@ -52,31 +45,25 @@ module ForemanFogProxmox
     end
 
     def templates
-      cached_templates = cache.cache(:templates) do
-        volumes = fog_nodes.flat_map do |node|
-          storages = node.storages.list_by_content_type 'images'
-          logger.debug("storages(): node_id #{node.node} type images")
-          storages.reject { |storage| storage.active.to_i.zero? }.sort_by(&:storage).flat_map do |storage|
-            # Skip disabled storages (enabled == 0 or nil)
-            unless storage.enabled.to_i == 1
-              logger.warn("Skipping disabled storage #{storage.identity} on #{node.node}")
-              next []
-            end
-
-            # Fetch QEMU and LXC template images
-            storage.volumes.list_by_content_type('images') + storage.volumes.list_by_content_type('rootdir')
-          rescue StandardError => e
-            logger.error("Failed to fetch volumes for storage #{storage.identity} on #{node.node}: #{e.message}")
-            []
+      volumes = []
+      nodes.each do |node|
+        storages(node.node).each do |storage|
+          # Skip disabled storages (enabled == 0 or nil)
+          unless storage.enabled.to_i == 1
+            logger.warn("Skipping disabled storage #{storage.identity} on #{node.node}")
+            next
           end
-        end
 
-        volumes.select(&:template?).map do |volume|
-          extract_attributes(volume, [:vmid, :name, :volid, :node_id]).merge(template: true)
+          # Fetch QEMU and LXC template images
+          volumes += storage.volumes.list_by_content_type('images')
+          volumes += storage.volumes.list_by_content_type('rootdir')
+        rescue StandardError => e
+          logger.error("Failed to fetch volumes for storage #{storage.identity} on #{node.node}: #{e.message}")
+          next
         end
       end
-
-      structs_from_cache(cached_templates)
+      # for creating image, only list volumes which are templated
+      volumes.select(&:template?)
     end
 
     def template(uuid)

data/app/models/foreman_fog_proxmox/proxmox_pools.rb

@@ -20,25 +20,8 @@
 module ForemanFogProxmox
   module ProxmoxPools
     def pools
-      cached_pools = cache.cache(:pools) do
-        pools = identity_client.pools.all
-        pools.sort_by(&:poolid).map do |pool|
-          extract_attributes(pool, [:poolid, :comment]).merge(
-            members: Array(pool.try(:members)).map do |member|
-              { vmid: member['vmid'] }
-            end
-          )
-        end
-      end
-
-      # Store only serializable hashes in the cache. After retrieval we recreate the pool objects and reattach the `has_server?` helper method.
-      Array(cached_pools).map do |pool|
-        OpenStruct.new(pool).tap do |pool_object|
-          pool_object.define_singleton_method(:has_server?) do |vmid|
-            Array(members).any? { |member| member[:vmid].to_s == vmid.to_s || member['vmid'].to_s == vmid.to_s }
-          end
-        end
-      end
+      pools = identity_client.pools.all
+      pools.sort_by(&:poolid)
     end
 
     def pool_owner(vm)

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -36,8 +36,6 @@ module ForemanFogProxmox
       type = args[:type]
       node = client.nodes.get(args[:node_id])
       vmid = args[:vmid] = assign_vmid(args[:vmid].to_i, node)
-      raise ::Foreman::Exception, format(N_('invalid vmid=%<vmid>s'), vmid: vmid) unless node.servers.id_valid?(vmid)
-
       image_id = args[:image_id]
       remove_volume_keys(args)
       if image_id
@@ -55,8 +53,15 @@ module ForemanFogProxmox
       raise e
     end
 
-    def assign_vmid(vmid, node)
-      (vmid < 1) ? node.servers.next_id : vmid
+    def assign_vmid(vmid, node, log: true)
+      vmid = node.servers.next_id if vmid < 1
+
+      unless node.servers.id_valid?(vmid)
+        logger.warn("Requested VMID #{vmid} is occupied or out of range, requesting a new VMID") if log
+        vmid = node.servers.next_id
+      end
+
+      vmid
     end
 
     def compute_clone_attributes(args, container, type)

data/app/models/foreman_fog_proxmox/proxmox_vm_new.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ModuleLength
+
 # Copyright 2019 Tristan Robert
 
 # This file is part of ForemanFogProxmox.
@@ -97,7 +99,7 @@ module ForemanFogProxmox
     end
 
     def default_node
-      fog_nodes.first
+      nodes.first
     end
 
     def default_node_id
@@ -182,10 +184,17 @@ module ForemanFogProxmox
       config_attributes.delete_if { |key, _value| ['disks', 'interfaces'].include?(key) }
     end
 
+    def assign_available_vmid(new_attr, node)
+      return if new_attr['vmid'].blank? || new_attr['node_id'].blank?
+
+      new_attr['vmid'] = assign_vmid(new_attr['vmid'].to_i, node, log: false)
+    end
+
     def new_typed_vm(new_attr, type)
       convert_config_attributes(new_attr) if new_attr.key?(:config_attributes)
       node_id = new_attr['node_id']
       node = node_id ? client.nodes.get(node_id) : default_node
+      assign_available_vmid(new_attr, node)
       new_attr_type = new_attr['type']
       new_attr_type ||= new_attr['config_attributes']['type'] if new_attr.key?('config_attributes')
       new_attr_type ||= type
@@ -201,3 +210,5 @@ module ForemanFogProxmox
     end
   end
 end
+
+# rubocop:enable Metrics/ModuleLength

data/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb

@@ -23,47 +23,29 @@ module ForemanFogProxmox
     include ProxmoxVMUuidHelper
 
     def nodes
-      cached_nodes = cache.cache(:nodes) do
-        nodes = client.nodes.all if client
-        nodes&.sort_by(&:node)&.map do |node|
-          { node: node.node }
-        end
-      end
-
-      structs_from_cache(cached_nodes)
+      nodes = client.nodes.all if client
+      nodes&.sort_by(&:node)
     end
 
     def storages(node_id = default_node_id, type = 'images')
-      cached_storages = cache.cache(:"storages-#{node_id}-#{type}") do
-        node = client.nodes.get(node_id) || default_node
-        storages = node.storages.list_by_content_type type
-        logger.debug("storages(): node_id #{node_id} type #{type}")
-        storages.reject { |s| s.enabled.to_i.zero? || s.active.to_i.zero? }.sort_by(&:storage).map do |storage|
-          fields = [:storage, :enabled, :active, :content, :node_id, :avail, :used, :total]
-          extract_attributes(storage, fields).merge(identity: storage.storage)
-        end
-      end
-
-      structs_from_cache(cached_storages)
+      node = client.nodes.get node_id
+      node ||= default_node
+      storages = node.storages.list_by_content_type type
+      logger.debug("storages(): node_id #{node_id} type #{type}")
+      storages.reject { |s| s.enabled.to_i.zero? || s.active.to_i.zero? }.sort_by(&:storage)
     end
 
     def bridges(node_id = default_node_id)
-      cached_bridges = cache.cache(:"bridges-#{node_id}") do
-        node = network_client.nodes.get node_id
-        node ||= network_client.nodes.first
-        bridges = node.networks.all(type: 'any_bridge')
-        bridges.sort_by(&:iface).map do |bridge|
-          extract_attributes(bridge, [:iface, :node_id]).merge(identity: bridge.iface)
-        end
-      end
-
-      structs_from_cache(cached_bridges)
+      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 = {})
       vms = []
-      fog_nodes.each { |node| vms += node.servers.all + node.containers.all }
+      nodes.each { |node| vms += node.servers.all + node.containers.all }
       vms.each { |vm| attach_compute_resource_id(vm) }
       if opts.key?(:eager_loading) && opts[:eager_loading]
         vms_eager = []
@@ -77,7 +59,7 @@ module ForemanFogProxmox
       # look for the uuid on all known nodes
       vm = nil
       vmid = extract_vmid(uuid)
-      fog_nodes.each do |node|
+      nodes.each do |node|
         vm = find_vm_in_servers_by_vmid(node.servers, vmid)
         vm ||= find_vm_in_servers_by_vmid(node.containers, vmid)
         next if vm.nil?
@@ -100,11 +82,6 @@ module ForemanFogProxmox
 
     private
 
-    def fog_nodes
-      nodes = client.nodes.all if client
-      nodes&.sort_by(&:node) || []
-    end
-
     def attach_compute_resource_id(virtual_machine)
       return virtual_machine if virtual_machine.nil?
 

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

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

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

@@ -36,8 +36,6 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
     :wrapper_class => "form-group #{'hide' unless ssl_verify_peer}",
     :placeholder => _("Optionally provide a CA, or a correctly ordered CA chain. If left blank, disable ssl_verify_peer.") %>
 <% end %>
-<%= checkbox_f f, :caching_enabled, :label => _("Enable Caching"),
-  :help_inline => _("Cache Proxmox resources.") %>
 <div class="col-md-offset-2">
   <%= test_connection_button_f(f, (f.object.nodes rescue true)) %>
 </div>

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

@@ -19,6 +19,10 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <td><%= _("URL") %></td>
   <td><%= @compute_resource.url %></td>
 </tr>
+<tr>
+  <td><%= _("Username") %></td>
+  <td><%= @compute_resource.user %></td>
+</tr>
 <tr>
   <td><%= _("Version") %></td>
   <td><%= @compute_resource.version %></td>
@@ -27,10 +31,6 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <td><%= _("Authentication method") %></td>
   <td><%= @compute_resource.auth_method %></td>
 </tr>
-<tr>
-  <td><%= _("Caching") %></td>
-  <td><%= @compute_resource.caching_enabled ? _("Enabled") : _("Disabled") %></td>
-</tr>
 <tr>
   <td><%= _("User token expires") %></td>
   <td><%= user_token_expiration_date(@compute_resource) %></td>

data/lib/foreman_fog_proxmox/engine.rb

@@ -43,17 +43,20 @@ module ForemanFogProxmox
           parameter_filter(ComputeResource, :uuid)
           # add dashboard widget
           widget 'foreman_fog_proxmox_widget', name: N_('Foreman Fog Proxmox widget'), sizex: 8, sizey: 1
+
+          p = Foreman::AccessControl.permission(:view_compute_resources)
+          p.actions.concat(%w[foreman_fog_proxmox/compute_resources/ostemplates_by_id_and_node_and_storage
+                              foreman_fog_proxmox/compute_resources/isos_by_id_and_node_and_storage
+                              foreman_fog_proxmox/compute_resources/ostemplates_by_id_and_node
+                              foreman_fog_proxmox/compute_resources/isos_by_id_and_node
+                              foreman_fog_proxmox/compute_resources/storages_by_id_and_node
+                              foreman_fog_proxmox/compute_resources/iso_storages_by_id_and_node
+                              foreman_fog_proxmox/compute_resources/bridges_by_id_and_node
+                              foreman_fog_proxmox/compute_resources/volumes_by_node_and_storage
+                              foreman_fog_proxmox/compute_resources/metadata])
+          p.actions.uniq!
+
           security_block :foreman_fog_proxmox do
-            permission :view_compute_resources, { :'foreman_fog_proxmox/compute_resources' =>
-              [:ostemplates_by_id_and_node_and_storage,
-               :isos_by_id_and_node_and_storage,
-               :ostemplates_by_id_and_node,
-               :isos_by_id_and_node,
-               :storages_by_id_and_node,
-               :iso_storages_by_id_and_node,
-               :bridges_by_id_and_node,
-               :volumes_by_node_and_storage,
-               :metadata] }
             permission :attach_cdrom_image, {},
               :resource_type => 'ComputeResource'
           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.24.0'
+  VERSION = '0.25.0'
 end

data/test/functional/compute_resources_controller_test.rb

@@ -69,18 +69,6 @@ module ForemanFogProxmox
       assert_not show_response.empty?
     end
     test 'should get volumes by node and storage' do
-      mock_storage = mock('storage')
-      mock_storage.stubs(:volumes).returns([])
-      mock_storages = mock('storages')
-      mock_storages.stubs(:get).with('local').returns(mock_storage)
-      mock_node = mock('node')
-      mock_node.stubs(:storages).returns(mock_storages)
-      mock_nodes = mock('nodes')
-      mock_nodes.stubs(:get).with('proxmox').returns(mock_node)
-      mock_client = mock('client')
-      mock_client.stubs(:nodes).returns(mock_nodes)
-      @compute_resource.stubs(:client).returns(mock_client)
-
       get :volumes_by_node_and_storage,
         params: { :compute_resource_id => @compute_resource.id, :node_id => 'proxmox', :storage => 'local' },
         session: set_session_user

data/test/unit/foreman_fog_proxmox/proxmox_test.rb

@@ -108,12 +108,6 @@ module ForemanFogProxmox
       assert cr.update_required?(old_attrs, new_attrs)
     end
 
-    test 'supports compute resource cache refreshing' do
-      cr = FactoryBot.build_stubbed(:proxmox_cr)
-
-      assert_respond_to cr, :refresh_cache
-    end
-
     test '#node' do
       node = mock('node')
       cr = FactoryBot.build_stubbed(:proxmox_cr)
@@ -121,27 +115,6 @@ module ForemanFogProxmox
       assert_equal node, (as_admin { cr.node })
     end
 
-    test '#extract_attributes returns selected resource attributes' do
-      cr = FactoryBot.build_stubbed(:proxmox_cr)
-
-      resource = OpenStruct.new(
-        vmid: 101,
-        name: 'template-101',
-        ignored: 'ignored'
-      )
-
-      attributes = cr.send(:extract_attributes, resource, [:vmid, :name, :missing])
-
-      assert_equal(
-        {
-          vmid: 101,
-          name: 'template-101',
-          missing: nil,
-        },
-        attributes
-      )
-    end
-
     private
 
     def hdd_compute_attrs(volumes_attrs)

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb

@@ -31,15 +31,18 @@ module ForemanFogProxmox
     include ProxmoxVMHelper
 
     describe 'create_vm' do
-      it 'raises Foreman::Exception when vmid <= 100 and vmid > 0' do
-        args = { vmid: '100' }
+      it 'uses next vmid when requested vmid is occupied or out of range' do
+        args = { vmid: '100', type: 'qemu', node_id: 'proxmox', start_after_create: '0' }
         servers = mock('servers')
-        servers.stubs(:id_valid?).returns(false)
+        servers.expects(:id_valid?).with(100).returns(false)
+        servers.expects(:next_id).returns('101')
         cr = mock_node_servers(ForemanFogProxmox::Proxmox.new, servers)
-        err = assert_raises Foreman::Exception do
-          cr.create_vm(args)
-        end
-        assert err.message.end_with?('invalid vmid=100')
+        cr.stubs(:parse_typed_vm).with(args, 'qemu').returns(args)
+        vm = mock('vm')
+        servers.expects(:create).with(args).returns(vm)
+        cr.create_vm(args)
+
+        assert_equal '101', args[:vmid]
       end
 
       it 'computes next vmid when vmid == 0 and creates server' do

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_test.rb

@@ -149,11 +149,11 @@ module ForemanFogProxmox
         pools = mock('pools')
         pool1 = mock('pool1')
         pool1.stubs(:poolid).returns('pool1')
-        pool1.stubs(:members).returns([{ 'vmid' => '100' }])
+        pool1.stubs(:has_server?).with('100').returns(true)
         pool1.expects(:remove_server).with(uuid)
         pool2 = mock('pool2')
         pool2.stubs(:poolid).returns('pool2')
-        pool2.stubs(:members).returns([])
+        pool2.stubs(:has_server?).with('100').returns(false)
         pool2.expects(:add_server).with(uuid)
         pools.stubs(:all).returns([pool1, pool2])
         pools.expects(:get).with('pool1').returns(pool1)
@@ -185,7 +185,7 @@ module ForemanFogProxmox
         identity_client = mock('identity_client')
         pools = mock('pools')
         pool1 = mock('pool1')
-        pool1.stubs(:members).returns([{ 'vmid' => '100' }])
+        pool1.stubs(:has_server?).with('100').returns(true)
         pool1.stubs(:poolid).returns('pool1')
         pool1.expects(:remove_server).with(uuid)
         pools.stubs(:all).returns([pool1])
@@ -218,7 +218,7 @@ module ForemanFogProxmox
         identity_client = mock('identity_client')
         pools = mock('pools')
         pool2 = mock('pool2')
-        pool2.stubs(:members).returns([])
+        pool2.stubs(:has_server?).with('100').returns(false)
         pool2.stubs(:poolid).returns('pool2')
         pool2.expects(:add_server).with(uuid)
         pools.stubs(:all).returns([pool2])

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb

@@ -39,5 +39,30 @@ module ForemanFogProxmox
         assert cr.destroy_vm('abc')
       end
     end
+
+    describe 'assign_vmid' do
+      it 'uses next vmid when requested vmid is already occupied' do
+        cr = ForemanFogProxmox::Proxmox.new
+        servers = mock('servers')
+        node = mock('node')
+        node.stubs(:servers).returns(servers)
+        servers.expects(:id_valid?).with(100).returns(false)
+        servers.expects(:next_id).returns('101')
+
+        assert_equal '101', cr.assign_vmid(100, node)
+      end
+
+      it 'does not log when logging is disabled' do
+        cr = ForemanFogProxmox::Proxmox.new
+        servers = mock('servers')
+        node = mock('node')
+        node.stubs(:servers).returns(servers)
+        servers.expects(:id_valid?).with(100).returns(false)
+        servers.expects(:next_id).returns('101')
+        cr.logger.expects(:warn).never
+
+        assert_equal '101', cr.assign_vmid(100, node, log: false)
+      end
+    end
   end
 end

data/test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb

@@ -111,5 +111,51 @@ module ForemanFogProxmox
         assert_equal vm, @cr.new_vm(attr)
       end
     end
+
+    describe 'assign_available_vmid' do
+      before do
+        @cr = FactoryBot.build_stubbed(:proxmox_cr)
+      end
+
+      it 'uses next vmid when requested vmid is already occupied' do
+        attr = { 'vmid' => '100', 'node_id' => 'proxmox' }.with_indifferent_access
+        servers = mock('servers')
+        node = mock('node')
+        node.stubs(:servers).returns(servers)
+        servers.expects(:id_valid?).with(100).returns(false)
+        servers.expects(:next_id).returns('101')
+        @cr.logger.expects(:warn).never
+
+        @cr.assign_available_vmid(attr, node)
+
+        assert_equal '101', attr['vmid']
+      end
+
+      it 'keeps requested vmid when it is available' do
+        attr = { 'vmid' => '100', 'node_id' => 'proxmox' }.with_indifferent_access
+        servers = mock('servers')
+        node = mock('node')
+        node.stubs(:servers).returns(servers)
+        servers.expects(:id_valid?).with(100).returns(true)
+        servers.expects(:next_id).never
+
+        @cr.assign_available_vmid(attr, node)
+
+        assert_equal 100, attr['vmid']
+      end
+
+      it 'does not assign vmid when requested vmid is blank' do
+        attr = { 'vmid' => '', 'node_id' => 'proxmox' }.with_indifferent_access
+        servers = mock('servers')
+        node = mock('node')
+        node.stubs(:servers).returns(servers)
+        servers.expects(:id_valid?).never
+        servers.expects(:next_id).never
+
+        @cr.assign_available_vmid(attr, node)
+
+        assert_equal '', attr['vmid']
+      end
+    end
   end
 end

data/test/unit/foreman_fog_proxmox/proxmox_vm_queries_test.rb

@@ -33,22 +33,6 @@ module ForemanFogProxmox
     include ProxmoxContainerMockFactory
     include ProxmoxVMHelper
 
-    describe 'nodes' do
-      it 'caches nodes for persisted compute resources' do
-        cr = FactoryBot.build_stubbed(:proxmox_cr, :caching_enabled => true)
-        node_z = OpenStruct.new(node: 'z-proxmox')
-        node_a = OpenStruct.new(node: 'a-proxmox')
-        nodes = mock('nodes')
-        nodes.expects(:all).once.returns([node_z, node_a])
-        client = mock('client')
-        client.stubs(:nodes).returns(nodes)
-        cr.stubs(:client).returns(client)
-
-        assert_equal %w[a-proxmox z-proxmox], cr.nodes.map(&:node)
-        assert_equal %w[a-proxmox z-proxmox], cr.nodes.map(&:node)
-      end
-    end
-
     describe 'storages' do
       before do
         @cr = ForemanFogProxmox::Proxmox.new
@@ -66,11 +50,7 @@ module ForemanFogProxmox
         active_storage = OpenStruct.new(storage: 'local', enabled: 1, active: 1)
         @storages_collection.stubs(:list_by_content_type).with('images').returns([active_storage])
 
-        storage = @cr.storages('proxmox').first
-        assert_equal 'local', storage.storage
-        assert_equal 1, storage.enabled
-        assert_equal 1, storage.active
-        assert_equal 'local', storage.identity
+        assert_equal [active_storage], @cr.storages('proxmox')
       end
 
       it 'returns active storages sorted by storage name' do
@@ -87,7 +67,7 @@ module ForemanFogProxmox
 
         @storages_collection.stubs(:list_by_content_type).with('images').returns([valid, invalid])
 
-        assert_equal ['good'], @cr.storages('proxmox').map(&:storage)
+        assert_equal [valid], @cr.storages('proxmox')
       end
 
       it 'excludes disabled storages (enabled=0)' do
@@ -117,45 +97,6 @@ module ForemanFogProxmox
 
         assert_empty @cr.storages('proxmox')
       end
-
-      it 'caches storages by node and content type for persisted compute resources' do
-        cr = FactoryBot.build_stubbed(:proxmox_cr, :caching_enabled => true)
-        active_storage = OpenStruct.new(storage: 'local', enabled: 1, active: 1)
-        storages_collection = mock('storages_collection')
-        storages_collection.expects(:list_by_content_type).with('images').once.returns([active_storage])
-        node = mock('node')
-        node.stubs(:storages).returns(storages_collection)
-        nodes = mock('nodes')
-        nodes.stubs(:get).with('proxmox').returns(node)
-        client = mock('client')
-        client.stubs(:nodes).returns(nodes)
-        cr.stubs(:client).returns(client)
-
-        assert_equal [active_storage.storage], cr.storages('proxmox').map(&:storage)
-        assert_equal [active_storage.storage], cr.storages('proxmox').map(&:storage)
-      end
-
-      it 'restores cached storages with normalized attributes' do
-        cr = FactoryBot.build_stubbed(:proxmox_cr, :caching_enabled => true)
-        active_storage = OpenStruct.new(storage: 'local', enabled: 1, active: 1)
-        storages_collection = mock('storages_collection')
-        storages_collection.expects(:list_by_content_type).with('images').once.returns([active_storage])
-        node = mock('node')
-        node.stubs(:storages).returns(storages_collection)
-        nodes = mock('nodes')
-        nodes.stubs(:get).with('proxmox').returns(node)
-        client = mock('client')
-        client.stubs(:nodes).returns(nodes)
-        cr.stubs(:client).returns(client)
-
-        cr.storages('proxmox')
-        cached_storage = cr.storages('proxmox').first
-
-        assert_equal 'local', cached_storage.storage
-        assert_equal 'local', cached_storage.identity
-        assert_equal [:active, :avail, :content, :enabled, :identity, :node_id, :storage, :total, :used],
-          cached_storage.to_h.keys.sort
-      end
     end
 
     describe 'find_vm_by_uuid' do

data/webpack/components/ProxmoxStoragesUtils.js

@@ -1,8 +1,12 @@
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 
+// Unit selection uses a 1024 step (binary); the value is scaled by 1000 (decimal).
+const BYTE_UNIT_STEP = 1024;
+const BYTE_UNIT_DIVISOR = 1000;
+
 const humanSize = size => {
-  const i = Math.floor(Math.log(size) / Math.log(1024));
-  return `${(size / 1000 ** i).toFixed(2) * 1} ${
+  const i = Math.floor(Math.log(size) / Math.log(BYTE_UNIT_STEP));
+  return `${(size / BYTE_UNIT_DIVISOR ** i).toFixed(2) * 1} ${
     ['B', 'kB', 'MB', 'GB', 'TB'][i]
   }`;
 };

data/webpack/global_test_setup.js

@@ -8,4 +8,5 @@ global.console.error = (error, stack) => {
 };
 
 // Increase jest timeout as some tests using multiple http mocks can time out on CI systems.
-jest.setTimeout(10000);
+const JEST_TIMEOUT_MS = 10000;
+jest.setTimeout(JEST_TIMEOUT_MS);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Tristan Robert
@@ -325,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files: