hybrid_platforms_conductor 33.0.0 → 33.0.1

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/cmdbs/platform_handlers_spec.rb

@@ -1,15 +1,15 @@
 describe HybridPlatformsConductor::NodesHandler do
 
-  context 'checking CMDB plugin PlatformHandlers' do
+  context 'when checking CMDB plugin PlatformHandlers' do
 
     it 'returns metadata published by the Platform\'s handler' do
-      with_test_platform(nodes: { 'test_node' => { meta: { property: 'value' } } }) do
+      with_test_platform({ nodes: { 'test_node' => { meta: { property: 'value' } } } }) do
         expect(cmdb(:platform_handlers).get_others(['test_node'], {})).to eq('test_node' => { property: 'value' })
       end
     end
 
     it 'returns services published by the Platform\'s handler' do
-      with_test_platform(nodes: { 'test_node' => { services: %w[service1 service2] } }) do
+      with_test_platform({ nodes: { 'test_node' => { services: %w[service1 service2] } } }) do
         expect(cmdb(:platform_handlers).get_services(['test_node'], {})).to eq('test_node' => %w[service1 service2])
       end
     end

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/cmdbs_plugins_api_spec.rb

@@ -1,14 +1,14 @@
 describe HybridPlatformsConductor::NodesHandler do
 
-  context 'checking CMDB plugins\' API called by NodesHandler' do
+  context 'when checking CMDB plugins\' API called by NodesHandler' do
 
     # Get a test platform ready to test using the test CMDB
     #
     # Parameters::
     # * *cmdbs* (Array<Symbol>): The test CMDBs to register [default: [:test_cmdb]]
-    # * *additional_platforms_content* (String): Additional configuration [default: '']
+    # * *additional_config* (String): Additional configuration [default: '']
     # * Proc: The code to be caklled for tests
-    def with_cmdb_test_platform(cmdbs: [:test_cmdb], additional_platforms_content: '')
+    def with_cmdb_test_platform(cmdbs: [:test_cmdb], additional_config: '')
       with_test_platform(
         {
           nodes: {
@@ -18,8 +18,7 @@ describe HybridPlatformsConductor::NodesHandler do
             'node4' => {}
           }
         },
-        false,
-        additional_platforms_content
+        additional_config: additional_config
       ) do
         register_test_cmdb(cmdbs)
         yield
@@ -205,36 +204,36 @@ describe HybridPlatformsConductor::NodesHandler do
     end
 
     it 'tries different CMDBs to get a property until one gives it' do
-      with_cmdb_test_platform(cmdbs: %i[test_cmdb test_cmdb2]) do
+      with_cmdb_test_platform(cmdbs: %i[test_cmdb test_cmdb_2]) do
         expect(test_nodes_handler.get_nothing_of('node1')).to eq 'node1 has nothing'
         expect(cmdb(:test_cmdb).calls).to eq [
           [:get_nothing, ['node1'], {}]
         ]
-        expect(cmdb(:test_cmdb2).calls).to eq [
+        expect(cmdb(:test_cmdb_2).calls).to eq [
           [:get_nothing, ['node1'], {}]
         ]
       end
     end
 
     it 'fails when different CMDBs get a property having conflicting values' do
-      with_cmdb_test_platform(cmdbs: %i[test_cmdb test_cmdb2]) do
-        expect { test_nodes_handler.get_different_comment_of('node1') }.to raise_error '[CMDB TestCmdb2.different_comment] - Returned a conflicting value for metadata different_comment of node node1: Comment from test_cmdb2 whereas the value was already set to Comment from test_cmdb'
+      with_cmdb_test_platform(cmdbs: %i[test_cmdb test_cmdb_2]) do
+        expect { test_nodes_handler.get_different_comment_of('node1') }.to raise_error '[CMDB TestCmdb2.different_comment] - Returned a conflicting value for metadata different_comment of node node1: Comment from test_cmdb_2 whereas the value was already set to Comment from test_cmdb'
         expect(cmdb(:test_cmdb).calls).to eq [
           [:get_different_comment, ['node1'], {}]
         ]
-        expect(cmdb(:test_cmdb2).calls).to eq [
+        expect(cmdb(:test_cmdb_2).calls).to eq [
           [:get_different_comment, ['node1'], {}]
         ]
       end
     end
 
     it 'does not fail when different CMDBs get a property having same values' do
-      with_cmdb_test_platform(cmdbs: %i[test_cmdb test_cmdb2]) do
+      with_cmdb_test_platform(cmdbs: %i[test_cmdb test_cmdb_2]) do
         expect(test_nodes_handler.get_same_comment_of('node1')).to eq 'Comment for node1'
         expect(cmdb(:test_cmdb).calls).to eq [
           [:get_same_comment, ['node1'], {}]
         ]
-        expect(cmdb(:test_cmdb2).calls).to eq [
+        expect(cmdb(:test_cmdb_2).calls).to eq [
           [:get_same_comment, ['node1'], {}]
         ]
       end
@@ -242,12 +241,12 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'does not fail when different CMDBs get a property having conflicting values but one is defined as priority' do
       with_cmdb_test_platform(
-        cmdbs: %i[test_cmdb test_cmdb2],
-        additional_platforms_content: 'master_cmdbs(test_cmdb2: :different_comment)'
+        cmdbs: %i[test_cmdb test_cmdb_2],
+        additional_config: 'master_cmdbs(test_cmdb_2: :different_comment)'
       ) do
-        expect(test_nodes_handler.get_different_comment_of('node1')).to eq 'Comment from test_cmdb2'
+        expect(test_nodes_handler.get_different_comment_of('node1')).to eq 'Comment from test_cmdb_2'
         expect(cmdb(:test_cmdb).calls).to eq nil
-        expect(cmdb(:test_cmdb2).calls).to eq [
+        expect(cmdb(:test_cmdb_2).calls).to eq [
           [:get_different_comment, ['node1'], {}]
         ]
       end
@@ -255,20 +254,20 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'can configure different priority rules for different properties' do
       with_cmdb_test_platform(
-        cmdbs: %i[test_cmdb test_cmdb2],
-        additional_platforms_content: '
+        cmdbs: %i[test_cmdb test_cmdb_2],
+        additional_config: '
           master_cmdbs(
-            test_cmdb: :different_comment2,
-            test_cmdb2: :different_comment
+            test_cmdb: :different_comment_2,
+            test_cmdb_2: :different_comment
           )
         '
       ) do
-        expect(test_nodes_handler.get_different_comment_of('node1')).to eq 'Comment from test_cmdb2'
-        expect(test_nodes_handler.get_different_comment2_of('node1')).to eq 'Comment2 from test_cmdb'
+        expect(test_nodes_handler.get_different_comment_of('node1')).to eq 'Comment from test_cmdb_2'
+        expect(test_nodes_handler.get_different_comment_2_of('node1')).to eq 'Comment2 from test_cmdb'
         expect(cmdb(:test_cmdb).calls).to eq [
-          [:get_different_comment2, ['node1'], { 'node1' => { different_comment: 'Comment from test_cmdb2' } }]
+          [:get_different_comment_2, ['node1'], { 'node1' => { different_comment: 'Comment from test_cmdb_2' } }]
         ]
-        expect(cmdb(:test_cmdb2).calls).to eq [
+        expect(cmdb(:test_cmdb_2).calls).to eq [
           [:get_different_comment, ['node1'], {}]
         ]
       end
@@ -276,75 +275,75 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'can configure different priority rules for different properties on different nodes' do
       with_cmdb_test_platform(
-        cmdbs: %i[test_cmdb test_cmdb2],
-        additional_platforms_content: '
-          for_nodes(\'node1\') do
+        cmdbs: %i[test_cmdb test_cmdb_2],
+        additional_config: <<~'EO_CONFIG'
+          for_nodes('node1') do
             master_cmdbs(
-              test_cmdb: :different_comment2,
-              test_cmdb2: :different_comment
+              test_cmdb: :different_comment_2,
+              test_cmdb_2: :different_comment
             )
           end
-          for_nodes(\'node2\') do
+          for_nodes('node2') do
             master_cmdbs(
               test_cmdb: :different_comment,
-              test_cmdb2: :different_comment2
+              test_cmdb_2: :different_comment_2
             )
           end
-        '
+        EO_CONFIG
       ) do
-        expect(test_nodes_handler.get_different_comment_of('node1')).to eq 'Comment from test_cmdb2'
+        expect(test_nodes_handler.get_different_comment_of('node1')).to eq 'Comment from test_cmdb_2'
         expect(test_nodes_handler.get_different_comment_of('node2')).to eq 'Comment from test_cmdb'
-        expect(test_nodes_handler.get_different_comment2_of('node1')).to eq 'Comment2 from test_cmdb'
-        expect(test_nodes_handler.get_different_comment2_of('node2')).to eq 'Comment2 from test_cmdb2'
+        expect(test_nodes_handler.get_different_comment_2_of('node1')).to eq 'Comment2 from test_cmdb'
+        expect(test_nodes_handler.get_different_comment_2_of('node2')).to eq 'Comment2 from test_cmdb_2'
         expect(cmdb(:test_cmdb).calls).to eq [
           [:get_different_comment, %w[node2], {}],
-          [:get_different_comment2, %w[node1], { 'node1' => { different_comment: 'Comment from test_cmdb2' } }]
+          [:get_different_comment_2, %w[node1], { 'node1' => { different_comment: 'Comment from test_cmdb_2' } }]
         ]
-        expect(cmdb(:test_cmdb2).calls).to eq [
+        expect(cmdb(:test_cmdb_2).calls).to eq [
           [:get_different_comment, %w[node1], {}],
-          [:get_different_comment2, %w[node2], { 'node2' => { different_comment: 'Comment from test_cmdb' } }]
+          [:get_different_comment_2, %w[node2], { 'node2' => { different_comment: 'Comment from test_cmdb' } }]
         ]
       end
     end
 
     it 'fails when there are conflicts in the definition of master CMDBs' do
       with_cmdb_test_platform(
-        cmdbs: %i[test_cmdb test_cmdb2],
-        additional_platforms_content: '
+        cmdbs: %i[test_cmdb test_cmdb_2],
+        additional_config: <<~'EO_CONFIG'
           master_cmdbs(
-            test_cmdb: %i[different_comment different_comment2]
+            test_cmdb: %i[different_comment different_comment_2]
           )
           master_cmdbs(
             test_cmdb: :different_comment,
-            test_cmdb2: :different_comment2
+            test_cmdb_2: :different_comment_2
           )
-        '
+        EO_CONFIG
       ) do
-        expect { test_nodes_handler.get_different_comment_of('node1') }.to raise_error 'Property different_comment2 have conflicting CMDB masters for node1 declared in the configuration: HybridPlatformsConductorTest::CmdbPlugins::TestCmdb and HybridPlatformsConductorTest::CmdbPlugins::TestCmdb2'
+        expect { test_nodes_handler.get_different_comment_of('node1') }.to raise_error 'Property different_comment_2 have conflicting CMDB masters for node1 declared in the configuration: HybridPlatformsConductorTest::CmdbPlugins::TestCmdb and HybridPlatformsConductorTest::CmdbPlugins::TestCmdb2'
       end
     end
 
     it 'fails when the CMDB marked as master does not implement the property' do
       with_cmdb_test_platform(
-        cmdbs: %i[test_cmdb test_cmdb2],
-        additional_platforms_content: '
+        cmdbs: %i[test_cmdb test_cmdb_2],
+        additional_config: <<~'EO_CONFIG'
           master_cmdbs(
-            test_cmdb2: :upcase
+            test_cmdb_2: :upcase
           )
-        '
+        EO_CONFIG
       ) do
-        expect { test_nodes_handler.get_upcase_of('node1') }.to raise_error 'CMDB test_cmdb2 is configured as a master for property upcase on node node1 but it does not implement the needed API to retrieve it'
+        expect { test_nodes_handler.get_upcase_of('node1') }.to raise_error 'CMDB test_cmdb_2 is configured as a master for property upcase on node node1 but it does not implement the needed API to retrieve it'
       end
     end
 
     it 'continues trying different CMDBs to get a property even if ones already gives it' do
-      with_cmdb_test_platform(cmdbs: %i[test_cmdb2 test_cmdb]) do
+      with_cmdb_test_platform(cmdbs: %i[test_cmdb_2 test_cmdb]) do
         expect(test_nodes_handler.get_nothing_of('node1')).to eq 'node1 has nothing'
         # test_cmdb was not even called, as it was registered second
         expect(cmdb(:test_cmdb).calls).to eq [
           [:get_nothing, ['node1'], {}]
         ]
-        expect(cmdb(:test_cmdb2).calls).to eq [
+        expect(cmdb(:test_cmdb_2).calls).to eq [
           [:get_nothing, ['node1'], {}]
         ]
       end

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/common_spec.rb

@@ -7,15 +7,15 @@ describe HybridPlatformsConductor::NodesHandler do
   end
 
   it 'initializes with a platform having no node' do
-    with_test_platform do
+    with_test_platform({}) do
       expect(test_nodes_handler.known_nodes).to eq []
     end
   end
 
   it 'iterates over defined nodes sequentially' do
-    with_test_platform(nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {}, 'node4' => {} }) do
+    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {}, 'node4' => {} } }) do
       nodes_iterated = []
-      test_nodes_handler.for_each_node_in(['node2', 'node3', 'node4']) do |node|
+      test_nodes_handler.for_each_node_in(%w[node2 node3 node4]) do |node|
         nodes_iterated << node
       end
       expect(nodes_iterated.sort).to eq %w[node2 node3 node4].sort
@@ -23,18 +23,15 @@ describe HybridPlatformsConductor::NodesHandler do
   end
 
   it 'iterates over defined nodes in parallel' do
-    with_test_platform(nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {}, 'node4' => {} }) do
+    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {}, 'node4' => {} } }) do
       nodes_iterated = []
-      test_nodes_handler.for_each_node_in(['node2', 'node3', 'node4'], parallel: true) do |node|
+      test_nodes_handler.for_each_node_in(%w[node2 node3 node4], parallel: true) do |node|
         sleep(
-          case node
-          when 'node2'
-            2
-          when 'node3'
-            3
-          when 'node4'
-            1
-          end
+          {
+            'node2' => 2,
+            'node3' => 3,
+            'node4' => 1
+          }[node]
         )
         nodes_iterated << node
       end
@@ -43,12 +40,12 @@ describe HybridPlatformsConductor::NodesHandler do
   end
 
   it 'iterates over defined nodes in parallel and handle errors correctly' do
-    with_test_platform(nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {}, 'node4' => {} }) do
+    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {}, 'node4' => {} } }) do
       nodes_iterated = []
       # Make sure we exit the test case even if the error is not handled correctly by using a timeout
       Timeout.timeout(5) do
         expect do
-          test_nodes_handler.for_each_node_in(['node2', 'node3', 'node4'], parallel: true) do |node|
+          test_nodes_handler.for_each_node_in(%w[node2 node3 node4], parallel: true) do |node|
             case node
             when 'node2'
               sleep 2
@@ -68,27 +65,34 @@ describe HybridPlatformsConductor::NodesHandler do
 
   it 'selects the correct configurations for a given node' do
     with_test_platform(
-      nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {}, 'node4' => {} },
-      nodes_lists: { 'nodeslist1' => %w[node1 node2], 'nodeslist2' => %w[node3 node4] }
+      {
+        nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {}, 'node4' => {} },
+        nodes_lists: { 'nodeslist1' => %w[node1 node2], 'nodeslist2' => %w[node3 node4] }
+      }
     ) do
-      expect(test_nodes_handler.select_confs_for_node('node2', [
-        {
-          conf: 'conf1',
-          nodes_selectors_stack: ['/node1/']
-        },
-        {
-          conf: 'conf2',
-          nodes_selectors_stack: ['/node2/']
-        },
-        {
-          conf: 'conf3',
-          nodes_selectors_stack: [[{ list: 'nodeslist1' }]]
-        },
-        {
-          conf: 'conf4',
-          nodes_selectors_stack: [[{ list: 'nodeslist2' }]]
-        }
-      ]).map { |config| config[:conf] }.sort).to eq %w[
+      expect(
+        test_nodes_handler.select_confs_for_node(
+          'node2',
+          [
+            {
+              conf: 'conf1',
+              nodes_selectors_stack: ['/node1/']
+            },
+            {
+              conf: 'conf2',
+              nodes_selectors_stack: ['/node2/']
+            },
+            {
+              conf: 'conf3',
+              nodes_selectors_stack: [[{ list: 'nodeslist1' }]]
+            },
+            {
+              conf: 'conf4',
+              nodes_selectors_stack: [[{ list: 'nodeslist2' }]]
+            }
+          ]
+        ).map { |config| config[:conf] }.sort
+      ).to eq %w[
         conf2
         conf3
       ].sort
@@ -97,59 +101,65 @@ describe HybridPlatformsConductor::NodesHandler do
 
   it 'selects the correct configurations for a given platform' do
     with_test_platforms(
-      'platform1' => { nodes: { 'node11' => {}, 'node12' => {}, 'node13' => {}, 'node14' => {} } },
-      'platform2' => { nodes: { 'node21' => {}, 'node22' => {}, 'node23' => {}, 'node24' => {} } }
+      {
+        'platform1' => { nodes: { 'node11' => {}, 'node12' => {}, 'node13' => {}, 'node14' => {} } },
+        'platform2' => { nodes: { 'node21' => {}, 'node22' => {}, 'node23' => {}, 'node24' => {} } }
+      }
     ) do
-      expect(test_nodes_handler.select_confs_for_platform('platform2', [
-        {
-          conf: 'conf1',
-          nodes_selectors_stack: ['/node1/']
-        },
-        {
-          conf: 'conf2',
-          nodes_selectors_stack: ['/node2/']
-        },
-        {
-          conf: 'conf3',
-          nodes_selectors_stack: [%w[node11 node13 node21 node22 node23 node24]]
-        },
-        {
-          conf: 'conf4',
-          nodes_selectors_stack: [%w[node11 node13 node21 node22 node24]]
-        }
-      ]).map { |config| config[:conf] }.sort).to eq %w[
+      expect(
+        test_nodes_handler.select_confs_for_platform(
+          'platform2',
+          [
+            {
+              conf: 'conf1',
+              nodes_selectors_stack: ['/node1/']
+            },
+            {
+              conf: 'conf2',
+              nodes_selectors_stack: ['/node2/']
+            },
+            {
+              conf: 'conf3',
+              nodes_selectors_stack: [%w[node11 node13 node21 node22 node23 node24]]
+            },
+            {
+              conf: 'conf4',
+              nodes_selectors_stack: [%w[node11 node13 node21 node22 node24]]
+            }
+          ]
+        ).map { |config| config[:conf] }.sort
+      ).to eq %w[
         conf2
         conf3
       ].sort
     end
   end
 
-    it 'computes the correct sudo for different nodes' do
-      with_test_platform(
-        {
-          nodes: {
-            'node1' => {},
-            'node2' => {},
-            'node3' => {}
-          }
-        },
-        false,
-        '
-          for_nodes(%w[node1 node2]) do
-            sudo_for { |user| "alt_sudo1 -p #{user}" }
-          end
-          for_nodes(\'node2\') do
-            sudo_for { |user| "alt_sudo2 -q #{user}" }
-          end
-        '
-      ) do
-        expect(test_nodes_handler.sudo_on('node1')).to eq 'alt_sudo1 -p root'
-        expect(test_nodes_handler.sudo_on('node1', 'test_user')).to eq 'alt_sudo1 -p test_user'
-        expect(test_nodes_handler.sudo_on('node2')).to eq 'alt_sudo2 -q root'
-        expect(test_nodes_handler.sudo_on('node2', 'test_user')).to eq 'alt_sudo2 -q test_user'
-        expect(test_nodes_handler.sudo_on('node3')).to eq 'sudo -u root'
-        expect(test_nodes_handler.sudo_on('node3', 'test_user')).to eq 'sudo -u test_user'
-      end
+  it 'computes the correct sudo for different nodes' do
+    with_test_platform(
+      {
+        nodes: {
+          'node1' => {},
+          'node2' => {},
+          'node3' => {}
+        }
+      },
+      additional_config: <<~'EO_CONFIG'
+        for_nodes(%w[node1 node2]) do
+          sudo_for { |user| "alt_sudo1 -p #{user}" }
+        end
+        for_nodes('node2') do
+          sudo_for { |user| "alt_sudo2 -q #{user}" }
+        end
+      EO_CONFIG
+    ) do
+      expect(test_nodes_handler.sudo_on('node1')).to eq 'alt_sudo1 -p root'
+      expect(test_nodes_handler.sudo_on('node1', 'test_user')).to eq 'alt_sudo1 -p test_user'
+      expect(test_nodes_handler.sudo_on('node2')).to eq 'alt_sudo2 -q root'
+      expect(test_nodes_handler.sudo_on('node2', 'test_user')).to eq 'alt_sudo2 -q test_user'
+      expect(test_nodes_handler.sudo_on('node3')).to eq 'sudo -u root'
+      expect(test_nodes_handler.sudo_on('node3', 'test_user')).to eq 'sudo -u test_user'
     end
+  end
 
 end