hybrid_platforms_conductor 33.0.0 → 33.0.1

data/lib/hybrid_platforms_conductor/topographer/plugins/graphviz.rb

@@ -23,7 +23,7 @@ module HybridPlatformsConductor
             # First write the definition of all nodes
             # Find all nodes belonging to no cluster
             orphan_nodes = @topographer.nodes_graph.keys
-            @topographer.nodes_graph.each do |node_name, node_info|
+            @topographer.nodes_graph.each_value do |node_info|
               orphan_nodes -= node_info[:includes]
             end
             orphan_nodes.sort.each do |node_name|
@@ -37,7 +37,7 @@ module HybridPlatformsConductor
                 link_options = {
                   label: link_label
                 }
-                f.puts "  \"#{dot_name_for_link(node_name)}\" -> \"#{dot_name_for_link(connected_node_name)}\" [ #{link_options.map { |opt, val| "#{opt}=\"#{val}\"" }.join(' ') } ];"
+                f.puts "  \"#{dot_name_for_link(node_name)}\" -> \"#{dot_name_for_link(connected_node_name)}\" [ #{link_options.map { |opt, val| "#{opt}=\"#{val}\"" }.join(' ')} ];"
               end
             end
             f.puts '}'
@@ -58,7 +58,7 @@ module HybridPlatformsConductor
             label: "#{@topographer.title_for(node_name)}#{description.nil? ? '' : "\\n#{description}"}",
             color: color_for(node_name)
           }
-          if @topographer.is_node_cluster?(node_name)
+          if @topographer.node_cluster?(node_name)
             # A cluster node
             file.puts "  subgraph \"#{dot_name}\" {\n#{node_options.map { |opt, val| "    #{opt}=\"#{val}\";\n" }.join}"
             # Always define an anchor node per cluster, as it will serve for links to and from the cluster itself.
@@ -66,14 +66,14 @@ module HybridPlatformsConductor
               label: "#{@topographer.title_for(node_name)}#{description.nil? ? '' : "\\n#{description}"}",
               color: 'green'
             }
-            file.puts "    \"#{dot_name_for_link(node_name)}\" [ #{anchor_node_options.map { |opt, val| "#{opt}=\"#{val}\"" }.join(' ') } ];"
+            file.puts "    \"#{dot_name_for_link(node_name)}\" [ #{anchor_node_options.map { |opt, val| "#{opt}=\"#{val}\"" }.join(' ')} ];"
             @topographer.nodes_graph[node_name][:includes].sort.each do |included_node_name|
               write_node_def_gv(file, included_node_name)
             end
             file.puts '  }'
           else
             # A normal node
-            file.puts "  \"#{dot_name}\" [ #{node_options.map { |opt, val| "#{opt}=\"#{val}\"" }.join(' ') } ];"
+            file.puts "  \"#{dot_name}\" [ #{node_options.map { |opt, val| "#{opt}=\"#{val}\"" }.join(' ')} ];"
           end
         end
 
@@ -86,7 +86,7 @@ module HybridPlatformsConductor
         def color_for(node_name)
           case @topographer.nodes_graph[node_name][:type]
           when :node
-            if @topographer.is_node_physical?(node_name)
+            if @topographer.node_physical?(node_name)
               'lightpink'
             else
               'lightblue2'
@@ -105,7 +105,7 @@ module HybridPlatformsConductor
         # Result::
         # * String: DOT node name
         def dot_name_for(node_name)
-          @topographer.is_node_cluster?(node_name) ? "cluster_#{node_name}" : node_name
+          @topographer.node_cluster?(node_name) ? "cluster_#{node_name}" : node_name
         end
 
         # Get the DOT node name used in a link for a given node
@@ -115,7 +115,7 @@ module HybridPlatformsConductor
         # Result::
         # * String: DOT node name used for links
         def dot_name_for_link(node_name)
-          @topographer.is_node_cluster?(node_name) ? "cluster_#{node_name}_anchor" : node_name
+          @topographer.node_cluster?(node_name) ? "cluster_#{node_name}_anchor" : node_name
         end
 
       end

data/lib/hybrid_platforms_conductor/topographer/plugins/json.rb

@@ -18,15 +18,15 @@ module HybridPlatformsConductor
           # Build the JSON
           json = {
             nodes: [],
-            links: [],
+            links: []
           }
           @topographer.nodes_graph.sort.each do |node_name, node_info|
             node_json = {
               id: node_name,
               description: "#{@topographer.title_for(node_name)} - #{@topographer.description_for(node_name)}",
-              group: group_for(node_name),
+              group: group_for(node_name)
             }
-            node_json[:includes] = node_info[:includes] if @topographer.is_node_cluster?(node_name)
+            node_json[:includes] = node_info[:includes] if @topographer.node_cluster?(node_name)
             json[:nodes] << node_json
             node_info[:connections].each do |connected_node_name, labels|
               json[:links] << {
@@ -51,7 +51,7 @@ module HybridPlatformsConductor
         def group_for(node_name)
           case @topographer.nodes_graph[node_name][:type]
           when :node
-            if @topographer.is_node_physical?(node_name)
+            if @topographer.node_physical?(node_name)
               1
             else
               2

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.0.0'
+  VERSION = '33.0.1'
 
 end

data/spec/hybrid_platforms_conductor_test.rb

@@ -20,16 +20,15 @@ require 'hybrid_platforms_conductor/hpc_plugins/cmdb/host_ip'
 require 'hybrid_platforms_conductor/hpc_plugins/cmdb/host_keys'
 require 'hybrid_platforms_conductor/hpc_plugins/cmdb/platform_handlers'
 require 'hybrid_platforms_conductor_test/cmdb_plugins/test_cmdb'
-require 'hybrid_platforms_conductor_test/cmdb_plugins/test_cmdb2'
+require 'hybrid_platforms_conductor_test/cmdb_plugins/test_cmdb_2'
 require 'hybrid_platforms_conductor_test/cmdb_plugins/test_cmdb_others'
-require 'hybrid_platforms_conductor_test/cmdb_plugins/test_cmdb_others2'
+require 'hybrid_platforms_conductor_test/cmdb_plugins/test_cmdb_others_2'
 require 'hybrid_platforms_conductor_test/helpers/actions_executor_helpers'
 require 'hybrid_platforms_conductor_test/helpers/cmd_runner_helpers'
 require 'hybrid_platforms_conductor_test/helpers/cmdb_helpers'
 require 'hybrid_platforms_conductor_test/helpers/config_helpers'
 require 'hybrid_platforms_conductor_test/helpers/connector_ssh_helpers'
 require 'hybrid_platforms_conductor_test/helpers/deployer_helpers'
-require 'hybrid_platforms_conductor_test/helpers/deployer_test_helpers'
 require 'hybrid_platforms_conductor_test/helpers/executables_helpers'
 require 'hybrid_platforms_conductor_test/helpers/nodes_handler_helpers'
 require 'hybrid_platforms_conductor_test/helpers/platform_handler_helpers'
@@ -41,8 +40,9 @@ require 'hybrid_platforms_conductor_test/helpers/serverless_chef_helpers'
 require 'hybrid_platforms_conductor_test/helpers/services_handler_helpers'
 require 'hybrid_platforms_conductor_test/helpers/tests_runner_helpers'
 require 'hybrid_platforms_conductor_test/platform_handler_plugins/test'
-require 'hybrid_platforms_conductor_test/platform_handler_plugins/test2'
+require 'hybrid_platforms_conductor_test/platform_handler_plugins/test_2'
 require 'hybrid_platforms_conductor_test/report_plugin'
+require 'hybrid_platforms_conductor_test/shared_examples/deployer'
 require 'hybrid_platforms_conductor_test/test_action'
 require 'hybrid_platforms_conductor_test/test_connector'
 require 'hybrid_platforms_conductor_test/test_log_plugin'
@@ -81,7 +81,7 @@ module HybridPlatformsConductorTest
 
     # Make sure the tested components are being reset before each test case
     RSpec.configure do |config|
-      config.before(:each) do
+      config.before do
         @actions_executor = nil
         @cmd_runner = nil
         @config = nil
@@ -170,7 +170,7 @@ module HybridPlatformsConductorTest
     # * Logger: The logger to be used
     def logger
       if ENV['TEST_DEBUG'] == '1'
-        logger = Logger.new(STDOUT)
+        logger = Logger.new($stdout)
         logger.level = Logger::DEBUG
         logger
       else

data/spec/hybrid_platforms_conductor_test/api/actions_executor/actions/bash_spec.rb

@@ -1,18 +1,22 @@
 describe HybridPlatformsConductor::ActionsExecutor do
 
-  context 'checking actions\' plugin bash' do
+  context 'when checking actions\' plugin bash' do
 
     it 'executes local Bash code' do
       with_test_platform_for_action_plugins do |repository|
-        expect(test_actions_executor.execute_actions('node' => {
-          bash: "echo TestContent >#{repository}/test_file ; echo TestStdout ; echo TestStderr 1>&2"
-        })['node']).to eq [0, "TestStdout\n", "TestStderr\n"]
+        expect(
+          test_actions_executor.execute_actions(
+            'node' => {
+              bash: "echo TestContent >#{repository}/test_file ; echo TestStdout ; echo TestStderr 1>&2"
+            }
+          )['node']
+        ).to eq [0, "TestStdout\n", "TestStderr\n"]
         expect(File.read("#{repository}/test_file")).to eq "TestContent\n"
       end
     end
 
     it 'executes local Bash code with timeout' do
-      with_test_platform_for_action_plugins do |repository|
+      with_test_platform_for_action_plugins do
         expect(test_actions_executor.execute_actions(
           { 'node' => {
             bash: 'sleep 2 ; echo ShouldNotReach'
@@ -24,11 +28,13 @@ describe HybridPlatformsConductor::ActionsExecutor do
 
     it 'logs local Bash code' do
       with_repository 'logs' do |logs_dir|
-        with_test_platform_for_action_plugins do |repository|
-          test_actions_executor.execute_actions({
-            'node' => {
-              bash: 'echo TestStdout ; sleep 1 ; echo TestStderr 1>&2'
-            } },
+        with_test_platform_for_action_plugins do
+          test_actions_executor.execute_actions(
+            {
+              'node' => {
+                bash: 'echo TestStdout ; sleep 1 ; echo TestStderr 1>&2'
+              }
+            },
             log_to_dir: logs_dir
           )
           expect(File.exist?("#{logs_dir}/node.stdout")).to eq true
@@ -40,4 +46,3 @@ describe HybridPlatformsConductor::ActionsExecutor do
   end
 
 end
-

data/spec/hybrid_platforms_conductor_test/api/actions_executor/actions/interactive_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::ActionsExecutor do
 
-  context 'checking actions\' plugin interactive' do
+  context 'when checking actions\' plugin interactive' do
 
     it 'executes remote interactive session' do
       with_test_platform_for_action_plugins do

data/spec/hybrid_platforms_conductor_test/api/actions_executor/actions/remote_bash_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::ActionsExecutor do
 
-  context 'checking actions\' plugin remote_bash' do
+  context 'when checking actions\' plugin remote_bash' do
 
     it 'executes remote Bash code' do
       with_test_platform_for_action_plugins do
@@ -67,10 +67,12 @@ describe HybridPlatformsConductor::ActionsExecutor do
     it 'executes remote Bash code both from commands and a file' do
       with_test_platform_for_action_plugins do |repository|
         File.write("#{repository}/commands.txt", "bash_cmd3.bash\nbash_cmd4.bash")
-        test_actions_executor.execute_actions('node' => { remote_bash: {
-          commands: ['bash_cmd1.bash', 'bash_cmd2.bash'],
-          file: "#{repository}/commands.txt"
-        } })
+        test_actions_executor.execute_actions(
+          'node' => { remote_bash: {
+            commands: ['bash_cmd1.bash', 'bash_cmd2.bash'],
+            file: "#{repository}/commands.txt"
+          } }
+        )
         expect(test_actions_executor.connector(:test_connector).calls).to eq [
           [:connectable_nodes_from, ['node']],
           [:with_connection_to, ['node'], { no_exception: true }],
@@ -82,11 +84,13 @@ describe HybridPlatformsConductor::ActionsExecutor do
     it 'executes remote Bash code both from commands and a file in sequence' do
       with_test_platform_for_action_plugins do |repository|
         File.write("#{repository}/commands.txt", "bash_cmd3.bash\nbash_cmd4.bash")
-        test_actions_executor.execute_actions('node' => { remote_bash: [
-          'bash_cmd1.bash',
-          'bash_cmd2.bash',
-          { file: "#{repository}/commands.txt" }
-        ] })
+        test_actions_executor.execute_actions(
+          'node' => { remote_bash: [
+            'bash_cmd1.bash',
+            'bash_cmd2.bash',
+            { file: "#{repository}/commands.txt" }
+          ] }
+        )
         expect(test_actions_executor.connector(:test_connector).calls).to eq [
           [:connectable_nodes_from, ['node']],
           [:with_connection_to, ['node'], { no_exception: true }],
@@ -97,13 +101,15 @@ describe HybridPlatformsConductor::ActionsExecutor do
 
     it 'executes remote Bash code with environment variables set' do
       with_test_platform_for_action_plugins do
-        test_actions_executor.execute_actions('node' => { remote_bash: {
-          commands: 'bash_cmd.bash',
-          env: {
-            'var1' => 'value1',
-            'var2' => 'value2'
-          }
-        } })
+        test_actions_executor.execute_actions(
+          'node' => { remote_bash: {
+            commands: 'bash_cmd.bash',
+            env: {
+              'var1' => 'value1',
+              'var2' => 'value2'
+            }
+          } }
+        )
         expect(test_actions_executor.connector(:test_connector).calls).to eq [
           [:connectable_nodes_from, ['node']],
           [:with_connection_to, ['node'], { no_exception: true }],
@@ -115,4 +121,3 @@ describe HybridPlatformsConductor::ActionsExecutor do
   end
 
 end
-

data/spec/hybrid_platforms_conductor_test/api/actions_executor/actions/ruby_spec.rb

@@ -1,17 +1,21 @@
 describe HybridPlatformsConductor::ActionsExecutor do
 
-  context 'checking actions\' plugin ruby' do
+  context 'when checking actions\' plugin ruby' do
 
     it 'executes local Ruby code' do
       with_test_platform_for_action_plugins do
         executed = false
-        expect(test_actions_executor.execute_actions('node' => {
-          ruby: proc do |stdout, stderr, action|
-            stdout << 'TestStdout'
-            stderr << 'TestStderr'
-            executed = true
-          end
-        })['node']).to eq [0, 'TestStdout', 'TestStderr']
+        expect(
+          test_actions_executor.execute_actions(
+            'node' => {
+              ruby: proc do |stdout, stderr|
+                stdout << 'TestStdout'
+                stderr << 'TestStderr'
+                executed = true
+              end
+            }
+          )['node']
+        ).to eq [0, 'TestStdout', 'TestStderr']
         expect(executed).to eq true
       end
     end
@@ -20,16 +24,18 @@ describe HybridPlatformsConductor::ActionsExecutor do
       pending 'Implement timeout for Ruby actions'
       with_test_platform_for_action_plugins do
         executed = false
-        expect(test_actions_executor.execute_actions(
-          { 'node' => {
-            ruby: proc do |stdout, stderr, action|
-              sleep 2
-              stdout << 'ShouldNotReach'
-              executed = true
-            end
-          } },
-          timeout: 1
-        )['node']).to eq [:timeout, '', '']
+        expect(
+          test_actions_executor.execute_actions(
+            { 'node' => {
+              ruby: proc do |stdout, _stderr|
+                sleep 2
+                stdout << 'ShouldNotReach'
+                executed = true
+              end
+            } },
+            timeout: 1
+          )['node']
+        ).to eq [:timeout, '', '']
         expect(executed).to eq false
       end
     end
@@ -39,7 +45,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
         with_test_platform_for_action_plugins do
           test_actions_executor.execute_actions(
             { 'node' => {
-              ruby: proc do |stdout, stderr, action|
+              ruby: proc do |stdout, stderr|
                 stdout << "TestStdout\n"
                 stderr << "TestStderr\n"
               end
@@ -55,14 +61,18 @@ describe HybridPlatformsConductor::ActionsExecutor do
     it 'executes local Ruby code that needs an action' do
       with_test_platform_for_action_plugins do
         executed = false
-        expect(test_actions_executor.execute_actions('node' => {
-          ruby: proc do |stdout, stderr, action|
-            expect(action.is_a?(HybridPlatformsConductor::HpcPlugins::Action::Ruby)).to eq true
-            stdout << 'TestStdout'
-            stderr << 'TestStderr'
-            executed = true
-          end
-        })['node']).to eq [0, 'TestStdout', 'TestStderr']
+        expect(
+          test_actions_executor.execute_actions(
+            'node' => {
+              ruby: proc do |stdout, stderr, action|
+                expect(action.is_a?(HybridPlatformsConductor::HpcPlugins::Action::Ruby)).to eq true
+                stdout << 'TestStdout'
+                stderr << 'TestStderr'
+                executed = true
+              end
+            }
+          )['node']
+        ).to eq [0, 'TestStdout', 'TestStderr']
         expect(executed).to eq true
       end
     end
@@ -70,17 +80,21 @@ describe HybridPlatformsConductor::ActionsExecutor do
     it 'executes local Ruby code that needs a connector' do
       with_test_platform_for_action_plugins do
         executed = false
-        expect(test_actions_executor.execute_actions('node' => {
-          ruby: {
-            code: proc do |stdout, stderr, action, connector|
-              expect(connector.is_a?(HybridPlatformsConductorTest::TestConnector)).to eq true
-              stdout << 'TestStdout'
-              stderr << 'TestStderr'
-              executed = true
-            end,
-            need_remote: true
-          }
-        })['node']).to eq [0, 'TestStdout', 'TestStderr']
+        expect(
+          test_actions_executor.execute_actions(
+            'node' => {
+              ruby: {
+                code: proc do |stdout, stderr, _action, connector|
+                  expect(connector.is_a?(HybridPlatformsConductorTest::TestConnector)).to eq true
+                  stdout << 'TestStdout'
+                  stderr << 'TestStderr'
+                  executed = true
+                end,
+                need_remote: true
+              }
+            }
+          )['node']
+        ).to eq [0, 'TestStdout', 'TestStderr']
         expect(executed).to eq true
       end
     end
@@ -88,17 +102,21 @@ describe HybridPlatformsConductor::ActionsExecutor do
     it 'executes local Ruby code that does not need a connector' do
       with_test_platform_for_action_plugins do
         executed = false
-        expect(test_actions_executor.execute_actions('node' => {
-          ruby: {
-            code: proc do |stdout, stderr, action, connector|
-              expect(connector).to be_nil
-              stdout << 'TestStdout'
-              stderr << 'TestStderr'
-              executed = true
-            end,
-            need_remote: false
-          }
-        })['node']).to eq [0, 'TestStdout', 'TestStderr']
+        expect(
+          test_actions_executor.execute_actions(
+            'node' => {
+              ruby: {
+                code: proc do |stdout, stderr, _action, connector|
+                  expect(connector).to be_nil
+                  stdout << 'TestStdout'
+                  stderr << 'TestStderr'
+                  executed = true
+                end,
+                need_remote: false
+              }
+            }
+          )['node']
+        ).to eq [0, 'TestStdout', 'TestStderr']
         expect(executed).to eq true
       end
     end

data/spec/hybrid_platforms_conductor_test/api/actions_executor/actions/scp_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::ActionsExecutor do
 
-  context 'checking actions\' plugin scp' do
+  context 'when checking actions\' plugin scp' do
 
     it 'executes remote SCP' do
       with_test_platform_for_action_plugins do
@@ -32,10 +32,12 @@ describe HybridPlatformsConductor::ActionsExecutor do
 
     it 'executes remote SCP on several files' do
       with_test_platform_for_action_plugins do
-        test_actions_executor.execute_actions('node' => { scp: {
-          'from1' => 'to1',
-          'from2' => 'to2'
-        } })
+        test_actions_executor.execute_actions(
+          'node' => { scp: {
+            'from1' => 'to1',
+            'from2' => 'to2'
+          } }
+        )
         expect(test_actions_executor.connector(:test_connector).calls).to eq [
           [:connectable_nodes_from, ['node']],
           [:with_connection_to, ['node'], { no_exception: true }],
@@ -47,10 +49,12 @@ describe HybridPlatformsConductor::ActionsExecutor do
 
     it 'executes remote SCP with sudo' do
       with_test_platform_for_action_plugins do
-        test_actions_executor.execute_actions('node' => { scp: {
-          'from' => 'to',
-          sudo: true
-        } })
+        test_actions_executor.execute_actions(
+          'node' => { scp: {
+            'from' => 'to',
+            sudo: true
+          } }
+        )
         expect(test_actions_executor.connector(:test_connector).calls).to eq [
           [:connectable_nodes_from, ['node']],
           [:with_connection_to, ['node'], { no_exception: true }],
@@ -61,11 +65,13 @@ describe HybridPlatformsConductor::ActionsExecutor do
 
     it 'executes remote SCP with different owner and group' do
       with_test_platform_for_action_plugins do
-        test_actions_executor.execute_actions('node' => { scp: {
-          'from' => 'to',
-          owner: 'new_owner',
-          group: 'new_group'
-        } })
+        test_actions_executor.execute_actions(
+          'node' => { scp: {
+            'from' => 'to',
+            owner: 'new_owner',
+            group: 'new_group'
+          } }
+        )
         expect(test_actions_executor.connector(:test_connector).calls).to eq [
           [:connectable_nodes_from, ['node']],
           [:with_connection_to, ['node'], { no_exception: true }],