hybrid_platforms_conductor 32.9.0 → 32.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 378b6da76cab8e20f60c0517f7bbef90933b5d573069437ee16d913ca81c0689
-  data.tar.gz: 1924dd81e2740b50ee55758271282729d6df1fd6a45b555f96c321d1b40e54e3
+  metadata.gz: 4f1beb4de64ac4dcdc1de3e5063980ea4dab1b8ceef204baae0a9f4bf209f1f3
+  data.tar.gz: 0c5e65553da39646554d737c8a690939497a8c89f602a4eae01a4987fff994b7
 SHA512:
-  metadata.gz: f8a72778375c154e42829a430bec151a7553b79874d1a878e129d80eed22b0f77f094751ee370c84441e7ed658d9e7b87e80c8f950ba64b491e1e62eec1f4a2f
-  data.tar.gz: e437a3f4871bde44d6bcbcd8a588dd83ff33c0374cee3769eada500a3acf04606e37144f98d2a49aaf69e0ff8cdd935d3eaa396fea5bb19ac485184df883db24
+  metadata.gz: 3129d3b37140c6488b2b6a8b6c1c8cb22ce745181a643925d9bb2fdc77de97a331660c8d5193dde940535d58b545576796d22a29008d181c73bbf7bb384c2251
+  data.tar.gz: 187c6215c37e89b924693c1819fea12f8cc444858ac575f9445b535ae9866a396b01dbc5baaf85ca4e8163d60c8865c931eca319c4824148fdd06029920b9710

data/lib/hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox.rb

@@ -23,6 +23,13 @@ module HybridPlatformsConductor
           super
         end
 
+        # Re-authenticate the Proxmox instance
+        # This can be useful when the API returns errors due to invalidated tokens
+        def reauthenticate
+          log_info 'Force re-authentication to Proxmox'
+          @auth_params = create_ticket
+        end
+
       end
       ::Proxmox::Proxmox.prepend ProxmoxPatches
 
@@ -309,6 +316,8 @@ module HybridPlatformsConductor
             log_warn "[ #{@node}/#{@environment} ] - Proxmox API call get #{path} returned error #{response} (attempt ##{idx_try}/#{proxmox_test_info[:api_max_retries]})"
             raise "[ #{@node}/#{@environment} ] - Proxmox API call get #{path} returns #{response} continuously (tried #{idx_try + 1} times)" if idx_try >= proxmox_test_info[:api_max_retries]
             idx_try += 1
+            # We have to reauthenticate: error 500 raised by Proxmox are often due to token being invalidated wrongly
+            proxmox.reauthenticate
             sleep proxmox_test_info[:api_wait_between_retries_secs] + rand(5)
           end
           response
@@ -333,6 +342,8 @@ module HybridPlatformsConductor
               task = nil
               break if idx_try >= proxmox_test_info[:api_max_retries]
               idx_try += 1
+              # We have to reauthenticate: error 500 raised by Proxmox are often due to token being invalidated wrongly
+              proxmox.reauthenticate
               sleep proxmox_test_info[:api_wait_between_retries_secs] + rand(5)
             end
           end

data/lib/hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox/proxmox_waiter.rb

@@ -653,6 +653,9 @@ class ProxmoxWaiter
         break unless @gets_cache[path].is_a?(String) && @gets_cache[path] =~ /^NOK: error code = 5\d\d$/
         raise "Proxmox API get #{path} returns #{@gets_cache[path]} continuously (tried #{idx_try + 1} times)" if idx_try >= @config['api_max_retries']
         idx_try += 1
+        # We have to reauthenticate: error 500 raised by Proxmox are often due to token being invalidated wrongly
+        # TODO: Provide a way to do it properly in the official gem
+        @proxmox.instance_variable_set(:@auth_params, @proxmox.send(:create_ticket))
         sleep @config['api_wait_between_retries_secs']
       end
     end

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '32.9.0'
+  VERSION = '32.9.1'
 
 end

data/spec/hybrid_platforms_conductor_test/api/deployer/provisioners/proxmox/reserve_proxmox_container/retries_spec.rb

@@ -10,6 +10,7 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
         with_sync_node do
           mock_proxmox(mocked_pve_nodes: [{ 'pve_node_name' => {} }] * 5)
           expect(call_reserve_proxmox_container(2, 128 * 1024, 4, max_retries: 5)).to eq(error: 'not_enough_resources')
+          expect_proxmox_actions_to_be []
         end
       end
 
@@ -25,6 +26,23 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
             vm_id: 1000,
             vm_ip: '192.168.0.100'
           )
+          expect_proxmox_actions_to_be [
+            [
+              :post,
+              'nodes/pve_node_name/lxc',
+              {
+                'ostemplate' => 'test_template.iso',
+                'hostname' => 'test.hostname.my-domain.com',
+                'description' => /node: test_node\nenvironment: test_env/,
+                'cores' => 2,
+                'cpulimit' => 2,
+                'memory' => 1024,
+                'rootfs' => 'local-lvm:4',
+                'net0' => 'name=eth0,bridge=vmbr0,gw=172.16.16.16,ip=192.168.0.100/32',
+                'vmid' => 1000
+              }
+            ]
+          ]
         end
       end
 
@@ -34,6 +52,12 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
           result = call_reserve_proxmox_container(2, 1024, 4, config: { api_max_retries: 4 })
           expect(result[:error]).not_to eq nil
           expect(result[:error]).to match /Unhandled exception from reserve_proxmox_container: Proxmox API get nodes\/pve_node_name\/lxc returns NOK: error code = 500 continuously \(tried 5 times\)/
+          expect_proxmox_actions_to_be [
+            [:create_ticket],
+            [:create_ticket],
+            [:create_ticket],
+            [:create_ticket]
+          ]
         end
       end
 
@@ -45,6 +69,26 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
             vm_id: 1000,
             vm_ip: '192.168.0.100'
           )
+          expect_proxmox_actions_to_be [
+            [:create_ticket],
+            [:create_ticket],
+            [:create_ticket],
+            [
+              :post,
+              'nodes/pve_node_name/lxc',
+              {
+                'ostemplate' => 'test_template.iso',
+                'hostname' => 'test.hostname.my-domain.com',
+                'description' => /node: test_node\nenvironment: test_env/,
+                'cores' => 2,
+                'cpulimit' => 2,
+                'memory' => 1024,
+                'rootfs' => 'local-lvm:4',
+                'net0' => 'name=eth0,bridge=vmbr0,gw=172.16.16.16,ip=192.168.0.100/32',
+                'vmid' => 1000
+              }
+            ]
+          ]
         end
       end
 

data/spec/hybrid_platforms_conductor_test/api/deployer/provisioners/proxmox/state_spec.rb

@@ -23,20 +23,6 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
       end
     end
 
-
-    it '' do
-      with_test_proxmox_platform do |instance|
-        mock_proxmox_calls_with [
-          # 1 - The info on existing containers
-          mock_proxmox_to_get_nodes_info,
-          # 2 - The start of the container - fail a few times
-          mock_proxmox_to_start_node(nbr_api_errors: 2)
-        ]
-        instance.create
-        instance.start
-      end
-    end
-
     it 'retries calls to the API when getting back errors 5xx' do
       with_test_proxmox_platform do |instance|
         mock_proxmox_calls_with [

data/spec/hybrid_platforms_conductor_test/helpers/provisioner_proxmox_helpers.rb

@@ -156,6 +156,7 @@ module HybridPlatformsConductorTest
             idx_try += 1
             idx_try <= nbr_api_errors ? 'NOK: error code = 500' : task_name
           end
+          expect(proxmox).to receive(:reauthenticate).exactly(nbr_api_errors - (task_status.nil? ? 1 : 0)).times
           # Mock checking task status
           unless task_status.nil?
             # Mock checking task status
@@ -294,6 +295,7 @@ module HybridPlatformsConductorTest
               ]
             end
           end
+          expect(proxmox).to receive(:reauthenticate).exactly(nbr_api_errors - (status.nil? ? 1 : 0)).times
           unless status.nil?
             expect(proxmox).to receive(:get).with('nodes/pve_node_name/lxc/1024/status/current') do
               {
@@ -641,6 +643,10 @@ module HybridPlatformsConductorTest
                   raise "Unknown Proxmox API post call: #{path}. Please adapt the test framework."
                 end
               end
+              # Mock create_ticket
+              allow(proxmox).to receive(:create_ticket) do
+                @proxmox_actions << [:create_ticket]
+              end
               proxmox
             end
           end,
@@ -808,7 +814,13 @@ module HybridPlatformsConductorTest
       # Parameters::
       # * *expected_proxmox_actions* (Array<Array>): Expected Proxmox actions
       def expect_proxmox_actions_to_be(expected_proxmox_actions)
-        expect(@proxmox_actions.size).to eq expected_proxmox_actions.size
+        expect(@proxmox_actions.size).to eq(expected_proxmox_actions.size), <<~EOS
+          Expected #{expected_proxmox_actions.size} Proxmox actions, but got #{@proxmox_actions.size} instead:
+          ----- Received:
+          #{@proxmox_actions.map(&:inspect).join("\n")}
+          ----- Expected:
+          #{expected_proxmox_actions.map(&:inspect).join("\n")}
+        EOS
         @proxmox_actions.zip(expected_proxmox_actions).each do |proxmox_action, expected_proxmox_action|
           expect(proxmox_action.size).to eq expected_proxmox_action.size
           expect(proxmox_action[0..1]).to eq expected_proxmox_action[0..1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 32.9.0
+  version: 32.9.1
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators