hybrid_platforms_conductor 32.5.0 → 32.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834a3af157221b88e6a150738b146f90fdf832c43fe5e8471619879c47a22d5b
-  data.tar.gz: c4f54b879fbfba923fda2a8aee1b299cb846ed9478ca9bd81535f220ec622f69
+  metadata.gz: d6b6259b1f05bb082b4f2c6820f74b6c90dad15f5868a311337429b80d233500
+  data.tar.gz: c5f58e3ba104ba2365addea64ab08c43a4fe9797430c950bf01258eb7bfcdc1b
 SHA512:
-  metadata.gz: 42ae65da627c812b096c0e9f9b4bb8c9ac4dde3185e1f6cf8d1405acbab960d5c5c88050c25e3d45906acb6054c73fd7ec29b2e5751b1ec38734f83a33f34bef
-  data.tar.gz: 41e641381b34d9d0841770974c4401612bfc3a4d11a5ec2fe85969f40ab1bfce0952cb4bbf5b7d2fce5420d9090a4962e278b9fb84d4251e0f13ee84db405e6c
+  metadata.gz: b079e89a17630ed994614bc24e76ba2154ae52fcaf3712feaaef9e823487d933d6b33b87b3aa253e8d11270d5765d061349c4a37f467e81d729d994ed1f7b72e
+  data.tar.gz: 4a89e197bed2c87dbc10d66d8a3f6240c68deb7c2799962be282634c3c109b653c2a66725baa5ca44e38fd0bf1ec992148720047668c1c7786bd494a8e3836e7

data/lib/hybrid_platforms_conductor/hpc_plugins/connector/ssh.rb

@@ -16,11 +16,40 @@ module HybridPlatformsConductor
 
         module PlatformsDslSsh
 
+          # List of SSH connection transformations:
+          # * *nodes_selectors_stack* (Array<Object>): Stack of nodes selectors impacted by this rule
+          # * *transform* (Proc): Code called to transform SSH connection info:
+          #   Parameters::
+          #   * *node* (String): Node for which we transform the SSH connection
+          #   * *connection* (String or nil): The connection host or IP, or nil if none
+          #   * *connection_user* (String): The connection user
+          #   * *gateway* (String or nil): The gateway name, or nil if none
+          #   * *gateway_user* (String or nil): The gateway user, or nil if none
+          #   Result::
+          #   * String: The transformed connection host or IP, or nil if none
+          #   * String: The transformed connection user
+          #   * String or nil: The transformed gateway name, or nil if none
+          #   * String or nil: The transformed gateway user, or nil if none
+          # Array< Hash<Symbol, Object> >
+          attr_reader :ssh_connection_transforms
+
           # Initialize the DSL
           def init_ssh
             # List of gateway configurations, per gateway config name
             # Hash<Symbol, String>
             @gateways = {}
+            @ssh_connection_transforms = []
+          end
+
+          # Define a transformation of SSH connection.
+          #
+          # Parameters::
+          # * *transform* (Proc): Code to be called to transform an SSH connection (see ssh_connection_transforms signature for details)
+          def transform_ssh_connection(&transform)
+            @ssh_connection_transforms << {
+              nodes_selectors_stack: current_nodes_selectors_stack,
+              transform: transform
+            }
           end
 
           # Register a new gateway configuration
@@ -295,7 +324,7 @@ module HybridPlatformsConductor
         # Result::
         # * String: The ssh URL connecting to the current node
         def ssh_url
-          "#{@ssh_user}@hpc.#{@node}"
+          "hpc.#{@node}"
         end
 
         # Get an SSH configuration content giving access to nodes of the platforms with the current configuration
@@ -318,14 +347,6 @@ module HybridPlatformsConductor
             # ENDPOINTS #
             #############
 
-            Host *
-              User #{@ssh_user}
-              # Default control socket path to be used when multiplexing SSH connections
-              ControlPath #{control_master_file('%h', '%p', '%r')}
-              #{open_ssh_major_version >= 7 ? 'PubkeyAcceptedKeyTypes +ssh-dss' : ''}
-              #{known_hosts_file.nil? ? '' : "UserKnownHostsFile #{known_hosts_file}"}
-              #{@ssh_strict_host_key_checking ? '' : 'StrictHostKeyChecking no'}
-
           EOS
 
           # Add each node
@@ -333,21 +354,37 @@ module HybridPlatformsConductor
           @nodes_handler.prefetch_metadata_of nodes, %i[private_ips hostname host_ip description]
           nodes.sort.each do |node|
             # Generate the conf for the node
-            begin
-              connection, gateway, gateway_user = connection_info_for(node)
+            connection, connection_user, gateway, gateway_user = connection_info_for(node, no_exception: true)
+            if connection.nil?
+              config_content << "# #{node} - Not connectable using SSH - #{@nodes_handler.get_description_of(node) || ''}\n"
+            else
               config_content << "# #{node} - #{connection} - #{@nodes_handler.get_description_of(node) || ''}\n"
               config_content << "Host #{ssh_aliases_for(node).join(' ')}\n"
               config_content << "  Hostname #{connection}\n"
+              config_content << "  User \"#{connection_user}\"\n" if connection_user != @ssh_user
               config_content << "  ProxyCommand #{ssh_exec} -q -W %h:%p #{gateway_user}@#{gateway}\n" unless gateway.nil?
               if @passwords.key?(node)
                 config_content << "  PreferredAuthentications password\n"
                 config_content << "  PubkeyAuthentication no\n"
               end
-            rescue NotConnectableError
-              config_content << "# #{node} - Not connectable using SSH - #{@nodes_handler.get_description_of(node) || ''}\n"
             end
             config_content << "\n"
           end
+          # Add global definitions at the end of the SSH config, as they might be overriden by previous ones, and first match wins.
+          config_content << <<~EOS
+            ###########
+            # GLOBALS #
+            ###########
+
+            Host *
+              User #{@ssh_user}
+              # Default control socket path to be used when multiplexing SSH connections
+              ControlPath #{control_master_file('%h', '%p', '%r')}
+              #{open_ssh_major_version >= 7 ? 'PubkeyAcceptedKeyTypes +ssh-dss' : ''}
+              #{known_hosts_file.nil? ? '' : "UserKnownHostsFile #{known_hosts_file}"}
+              #{@ssh_strict_host_key_checking ? '' : 'StrictHostKeyChecking no'}
+
+          EOS
           config_content
         end
 
@@ -450,7 +487,7 @@ module HybridPlatformsConductor
                   with_lock_on_control_master_for(node) do |current_users, user_id|
                     working_master = false
                     ssh_exec = ssh_exec_for(node)
-                    ssh_url = "#{@ssh_user}@hpc.#{node}"
+                    ssh_url = "hpc.#{node}"
                     if current_users.empty?
                       log_debug "[ ControlMaster - #{ssh_url} ] - Creating SSH ControlMaster..."
                       # Create the control master
@@ -518,7 +555,7 @@ module HybridPlatformsConductor
               user_locks_mutex.synchronize do
                 user_locks.each do |node, user_id|
                   with_lock_on_control_master_for(node, user_id: user_id) do |current_users, user_id|
-                    ssh_url = "#{@ssh_user}@hpc.#{node}"
+                    ssh_url = "hpc.#{node}"
                     log_warn "[ ControlMaster - #{ssh_url} ] - Current process/thread was not part of the ControlMaster users anymore whereas it should have been" unless current_users.include?(user_id)
                     remaining_users = current_users - [user_id]
                     if remaining_users.empty?
@@ -562,8 +599,9 @@ module HybridPlatformsConductor
             # TODO: Add test case when control file is missing ad when it is stale
             # Get the list of existing process/thread ids using this control master
             existing_users = File.exist?(control_master_users_file) ? File.read(control_master_users_file).split("\n") : []
-            ssh_url = "#{@ssh_user}@hpc.#{node}"
-            control_path_file = control_master_file(connection_info_for(node).first, '22', @ssh_user)
+            ssh_url = "hpc.#{node}"
+            connection, connection_user, _gateway, _gateway_user = connection_info_for(node)
+            control_path_file = control_master_file(connection, '22', connection_user)
             if existing_users.empty?
               # Make sure there is no stale one.
               if File.exist?(control_path_file)
@@ -595,7 +633,7 @@ module HybridPlatformsConductor
         # * *port* (String): The port. Can be a string as ssh config uses wildchars.
         # * *user* (String): The user
         def control_master_file(host, port, user)
-          "#{@tmp_dir}/hpc_actions_executor_mux_#{host}_#{port}_#{user}"
+          "#{@tmp_dir}/hpc_ssh_mux_#{host}_#{port}_#{user}"
         end
 
         # Provide a bootstrapped ssh executable that includes an SSH config allowing access to nodes.
@@ -627,7 +665,7 @@ module HybridPlatformsConductor
                 nodes.sort.each do |node|
                   host_keys = @nodes_handler.get_host_keys_of(node)
                   if host_keys && !host_keys.empty?
-                    connection, _gateway, _gateway_user = connection_info_for(node)
+                    connection, _connection_user, _gateway, _gateway_user = connection_info_for(node)
                     host_keys.each do |host_key|
                       file.puts "#{connection} #{host_key}"
                     end
@@ -660,11 +698,13 @@ module HybridPlatformsConductor
         #
         # Parameters::
         # * *node* (String): The node to access
+        # * *no_exception* (Boolean): Should we skip exceptions in case of no connection possible? [default: false]
         # Result::
-        # * String: The real hostname or IP to be used to connect
+        # * String: The real hostname or IP to be used to connect, or nil if none and no_exception is true
+        # * String: The real user to be used to connect, or nil if none and no_exception is true
         # * String or nil: The gateway name to be used (should be defined by the gateways configurations), or nil if no gateway to be used.
         # * String or nil: The gateway user to be used, or nil if none.
-        def connection_info_for(node)
+        def connection_info_for(node, no_exception: false)
           connection =
             if @nodes_handler.get_host_ip_of(node)
               @nodes_handler.get_host_ip_of(node)
@@ -673,12 +713,18 @@ module HybridPlatformsConductor
             elsif @nodes_handler.get_hostname_of(node)
               @nodes_handler.get_hostname_of(node)
             else
-              raise NotConnectableError, "No connection possible to #{node}"
+              nil
             end
+          connection_user = @ssh_user
           gateway = @nodes_handler.get_gateway_of node
           gateway_user = @nodes_handler.get_gateway_user_of node
           gateway_user = @ssh_gateway_user if !gateway.nil? && gateway_user.nil?
-          [connection, gateway, gateway_user]
+          # In case we want to transform the connection info, do it here.
+          @nodes_handler.select_confs_for_node(node, @config.ssh_connection_transforms).each do |transform_info|
+            connection, connection_user, gateway, gateway_user = transform_info[:transform].call(node, connection, connection_user, gateway, gateway_user)
+          end
+          raise NotConnectableError, "No connection possible to #{node}" if connection.nil? && !no_exception
+          [connection, connection_user, gateway, gateway_user]
         end
 
         # Get the possible SSH aliases for a given node.

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '32.5.0'
+  VERSION = '32.6.0'
 
 end

data/spec/hybrid_platforms_conductor_test/api/actions_executor/connectors/ssh/config_dsl_spec.rb

@@ -43,6 +43,41 @@ describe HybridPlatformsConductor::ActionsExecutor do
         end
       end
 
+      it 'returns ssh transformation procs' do
+        with_test_platform(
+          {
+            nodes: {
+              'node1' => {},
+              'node2' => {},
+              'node3' => {}
+            },
+          },
+          false,
+          '
+            for_nodes(%w[node1 node3]) do
+              transform_ssh_connection do |node, connection, connection_user, gateway, gateway_user|
+                ["#{connection}_#{node}_13", "#{connection_user}_#{node}_13", "#{gateway}_#{node}_13", "#{gateway_user}_#{node}_13"]
+              end
+            end
+            for_nodes(\'node1\') do
+              transform_ssh_connection do |node, connection, connection_user, gateway, gateway_user|
+                ["#{connection}_#{node}_1", "#{connection_user}_#{node}_1", "#{gateway}_#{node}_1", "#{gateway_user}_#{node}_1"]
+              end
+            end
+          '
+        ) do
+          expect(test_config.ssh_connection_transforms.size).to eq 2
+          expect(test_config.ssh_connection_transforms[0][:nodes_selectors_stack]).to eq [%w[node1 node3]]
+          expect(test_config.ssh_connection_transforms[0][:transform].call('node1', 'test_host', 'test_user', 'test_gateway', 'test_gateway_user')).to eq [
+            'test_host_node1_13', 'test_user_node1_13', 'test_gateway_node1_13', 'test_gateway_user_node1_13'
+          ]
+          expect(test_config.ssh_connection_transforms[1][:nodes_selectors_stack]).to eq ['node1']
+          expect(test_config.ssh_connection_transforms[1][:transform].call('node1', 'test_host', 'test_user', 'test_gateway', 'test_gateway_user')).to eq [
+            'test_host_node1_1', 'test_user_node1_1', 'test_gateway_node1_1', 'test_gateway_user_node1_1'
+          ]
+        end
+      end
+
     end
 
   end

data/spec/hybrid_platforms_conductor_test/api/actions_executor/connectors/ssh/connections_spec.rb

@@ -52,6 +52,45 @@ describe HybridPlatformsConductor::ActionsExecutor do
         end
       end
 
+      it 'creates SSH master to several nodes with ssh connections transformed' do
+        with_test_platform(
+          { nodes: {
+          'node1' => { meta: { host_ip: '192.168.42.1' } },
+          'node2' => { meta: { host_ip: '192.168.42.2' } },
+          'node3' => { meta: { host_ip: '192.168.42.3' } }
+          } },
+          false,
+          '
+            for_nodes(%w[node1 node3]) do
+              transform_ssh_connection do |node, connection, connection_user, gateway, gateway_user|
+                ["#{connection}_#{node}_13", "#{connection_user}_#{node}_13", "#{gateway}_#{node}_13", "#{gateway_user}_#{node}_13"]
+              end
+            end
+            for_nodes(\'node1\') do
+              transform_ssh_connection do |node, connection, connection_user, gateway, gateway_user|
+                ["#{connection}_#{node}_1", "#{connection_user}_#{node}_1", "#{gateway}_#{node}_1", "#{gateway_user}_#{node}_1"]
+              end
+            end
+          '
+        ) do
+          with_cmd_runner_mocked(
+            [
+              ['which env', proc { [0, "/usr/bin/env\n", ''] }],
+              ['ssh -V 2>&1', proc { [0, "OpenSSH_7.4p1 Debian-10+deb9u7, OpenSSL 1.0.2u  20 Dec 2019\n", ''] }]
+            ] + ssh_expected_commands_for(
+              'node1' => { ip: '192.168.42.1', connection: '192.168.42.1_node1_13_node1_1', user: 'test_user_node1_13_node1_1' },
+              'node2' => { ip: '192.168.42.2', connection: '192.168.42.2', user: 'test_user' },
+              'node3' => { ip: '192.168.42.3', connection: '192.168.42.3_node3_13', user: 'test_user_node3_13' }
+            )
+          ) do
+            test_connector.ssh_user = 'test_user'
+            test_connector.with_connection_to(%w[node1 node2 node3]) do |connected_nodes|
+              expect(connected_nodes.sort).to eq %w[node1 node2 node3].sort
+            end
+          end
+        end
+      end
+
       it 'fails when an SSH master can\'t be created' do
         with_test_platform(nodes: {
           'node1' => { meta: { host_ip: '192.168.42.1' } },
@@ -73,7 +112,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
             )
           ) do
             test_connector.ssh_user = 'test_user'
-            expect { test_connector.with_connection_to(%w[node1 node2 node3]) }.to raise_error(/^Error while starting SSH Control Master with .+\/ssh -o BatchMode=yes -o ControlMaster=yes -o ControlPersist=yes test_user@hpc.node2 true: Can't connect to 192.168.42.2$/)
+            expect { test_connector.with_connection_to(%w[node1 node2 node3]) }.to raise_error(/^Error while starting SSH Control Master with .+\/ssh -o BatchMode=yes -o ControlMaster=yes -o ControlPersist=yes hpc.node2 true: Can't connect to 192.168.42.2$/)
           end
         end
       end
@@ -416,7 +455,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
               ['ssh -V 2>&1', proc { [0, "OpenSSH_7.4p1 Debian-10+deb9u7, OpenSSL 1.0.2u  20 Dec 2019\n", ''] }],
             ] +
               [[
-                /^.+\/ssh -o BatchMode=yes -o ControlMaster=yes -o ControlPersist=yes test_user@hpc\.node true$/,
+                /^.+\/ssh -o BatchMode=yes -o ControlMaster=yes -o ControlPersist=yes hpc\.node true$/,
                 proc do
                   nbr_boot_messages += 1
                   [255, '', "System is booting up. See pam_nologin(8)\nAuthentication failed.\n"]

data/spec/hybrid_platforms_conductor_test/api/actions_executor/connectors/ssh/global_helpers_spec.rb

@@ -35,8 +35,11 @@ describe HybridPlatformsConductor::ActionsExecutor do
         begin_marker = node.nil? ? /^Host \*$/ : /^# #{Regexp.escape(node)} - .+$/
         start_idx = ssh_config_lines.index { |line| line =~ begin_marker }
         return nil if start_idx.nil?
-        end_marker = /^# \w+ - .+$/
-        end_idx = ssh_config_lines[start_idx + 1..-1].index { |line| line =~ end_marker }
+        end_markers = [
+          /^\# \w+ - .+$/,
+          /^\#+$/
+        ]
+        end_idx = ssh_config_lines[start_idx + 1..-1].index { |line| end_markers.any? { |end_marker| line =~ end_marker } }
         end_idx = end_idx.nil? ? -1 : start_idx + end_idx
         ssh_config_lines[start_idx..end_idx].select do |line|
           stripped_line = line.strip
@@ -50,7 +53,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
           expect(ssh_config_for(nil)).to eq <<~EOS
             Host *
               User test_user
-              ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_actions_executor_mux_%h_%p_%r
+              ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_ssh_mux_%h_%p_%r
               PubkeyAcceptedKeyTypes +ssh-dss
           EOS
         end
@@ -62,7 +65,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
           expect(ssh_config_for(nil)).to eq <<~EOS
             Host *
               User test_user
-              ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_actions_executor_mux_%h_%p_%r
+              ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_ssh_mux_%h_%p_%r
               PubkeyAcceptedKeyTypes +ssh-dss
           EOS
         end
@@ -74,7 +77,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
           expect(ssh_config_for(nil, known_hosts_file: '/path/to/known_hosts')).to eq <<~EOS
             Host *
               User test_user
-              ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_actions_executor_mux_%h_%p_%r
+              ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_ssh_mux_%h_%p_%r
               PubkeyAcceptedKeyTypes +ssh-dss
               UserKnownHostsFile /path/to/known_hosts
           EOS
@@ -88,7 +91,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
           expect(ssh_config_for(nil)).to eq <<~EOS
             Host *
               User test_user
-              ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_actions_executor_mux_%h_%p_%r
+              ControlPath #{Dir.tmpdir}/hpc_ssh/hpc_ssh_mux_%h_%p_%r
               PubkeyAcceptedKeyTypes +ssh-dss
               StrictHostKeyChecking no
           EOS
@@ -274,6 +277,47 @@ describe HybridPlatformsConductor::ActionsExecutor do
         end
       end
 
+      it 'uses node transformed SSH connection' do
+        with_test_platform(
+          { nodes: {
+            'node1' => { meta: { host_ip: '192.168.42.1', gateway: 'test_gateway1', gateway_user: 'test_gateway1_user' } },
+            'node2' => { meta: { host_ip: '192.168.42.2', gateway: 'test_gateway2', gateway_user: 'test_gateway2_user' } },
+            'node3' => { meta: { host_ip: '192.168.42.3', gateway: 'test_gateway3', gateway_user: 'test_gateway3_user' } }
+          } },
+          false,
+          '
+            for_nodes(%w[node1 node3]) do
+              transform_ssh_connection do |node, connection, connection_user, gateway, gateway_user|
+                ["#{connection}_#{node}_13", "#{connection_user}_#{node}_13", "#{gateway}_#{node}_13", "#{gateway_user}_#{node}_13"]
+              end
+            end
+            for_nodes(\'node1\') do
+              transform_ssh_connection do |node, connection, connection_user, gateway, gateway_user|
+                ["#{connection}_#{node}_1", "#{connection_user}_#{node}_1", "#{gateway}_#{node}_1", "#{gateway_user}_#{node}_1"]
+              end
+            end
+          ') do
+          test_connector.ssh_user = 'test_user'
+          expect(ssh_config_for('node1')).to eq <<~EOS
+            Host hpc.node1
+              Hostname 192.168.42.1_node1_13_node1_1
+              User "test_user_node1_13_node1_1"
+              ProxyCommand ssh -q -W %h:%p test_gateway1_user_node1_13_node1_1@test_gateway1_node1_13_node1_1
+          EOS
+          expect(ssh_config_for('node2')).to eq <<~EOS
+            Host hpc.node2
+              Hostname 192.168.42.2
+              ProxyCommand ssh -q -W %h:%p test_gateway2_user@test_gateway2
+          EOS
+          expect(ssh_config_for('node3')).to eq <<~EOS
+            Host hpc.node3
+              Hostname 192.168.42.3_node3_13
+              User "test_user_node3_13"
+              ProxyCommand ssh -q -W %h:%p test_gateway3_user_node3_13@test_gateway3_node3_13
+          EOS
+        end
+      end
+
       it 'generates a config compatible for passwords authentication' do
         with_test_platform(nodes: { 'node' => { meta: { host_ip: '192.168.42.42' } } }) do
           test_connector.passwords['node'] = 'PaSsWoRd'

data/spec/hybrid_platforms_conductor_test/api/actions_executor/connectors/ssh/node_helpers_spec.rb

@@ -13,7 +13,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
 
       it 'provides an SSH URL that can be used by other processes to connect to this node' do
         with_test_platform_for_remote_testing do
-          expect(test_connector.ssh_url).to eq 'test_user@hpc.node'
+          expect(test_connector.ssh_url).to eq 'hpc.node'
         end
       end
 

data/spec/hybrid_platforms_conductor_test/api/actions_executor/connectors/ssh/remote_actions_spec.rb

@@ -6,7 +6,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
 
       it 'executes bash commands remotely' do
         with_test_platform_for_remote_testing(
-          expected_cmds: [[/.+\/ssh test_user@hpc\.node \/bin\/bash <<'EOF'\nbash_cmd.bash\nEOF/, proc { [0, 'Bash commands executed on node', ''] }]],
+          expected_cmds: [[/.+\/ssh hpc\.node \/bin\/bash <<'EOF'\nbash_cmd.bash\nEOF/, proc { [0, 'Bash commands executed on node', ''] }]],
           expected_stdout: 'Bash commands executed on node'
         ) do
           test_connector.remote_bash('bash_cmd.bash')
@@ -17,7 +17,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
         with_test_platform_for_remote_testing(
           expected_cmds: [
             [
-              /.+\/ssh test_user@hpc\.node \/bin\/bash <<'EOF'\nbash_cmd.bash\nEOF/,
+              /.+\/ssh hpc\.node \/bin\/bash <<'EOF'\nbash_cmd.bash\nEOF/,
               proc do |cmd, log_to_file: nil, log_to_stdout: true, log_stdout_to_io: nil, log_stderr_to_io: nil, expected_code: 0, timeout: nil, no_exception: false|
                 expect(timeout).to eq 5
                 [0, '', '']
@@ -33,7 +33,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
       it 'executes interactive commands remotely' do
         with_test_platform_for_remote_testing do
           expect(test_connector).to receive(:system) do |cmd|
-            expect(cmd).to match /^.+\/ssh test_user@hpc\.node$/
+            expect(cmd).to match /^.+\/ssh hpc\.node$/
           end
           test_connector.remote_interactive
         end
@@ -43,7 +43,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
         with_test_platform_for_remote_testing(
           expected_cmds: [
             [
-              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+src.file \| \/.+\/ssh\s+test_user@hpc\.node\s+"tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
+              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+src.file \| \/.+\/ssh\s+hpc\.node\s+"tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
               proc { [0, '', ''] }
             ]
           ]
@@ -56,7 +56,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
         with_test_platform_for_remote_testing(
           expected_cmds: [
             [
-              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+src.file \| \/.+\/ssh\s+test_user@hpc\.node\s+"tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
+              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+src.file \| \/.+\/ssh\s+hpc\.node\s+"tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
               proc do |cmd, log_to_file: nil, log_to_stdout: true, log_stdout_to_io: nil, log_stderr_to_io: nil, expected_code: 0, timeout: nil, no_exception: false|
                 expect(timeout).to eq 5
                 [0, '', '']
@@ -76,7 +76,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
             [
               /.+\/hpc_temp_cmds_.+\.sh$/,
               proc do |received_cmd|
-                expect(File.read(received_cmd)).to match /.+\/ssh test_user@hpc\.node \/bin\/bash <<'EOF'\n#{Regexp.escape(cmd)}\nEOF/
+                expect(File.read(received_cmd)).to match /.+\/ssh hpc\.node \/bin\/bash <<'EOF'\n#{Regexp.escape(cmd)}\nEOF/
                 [0, 'Bash commands executed on node', '']
               end
             ]
@@ -92,7 +92,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
         with_test_platform_for_remote_testing(
           expected_cmds: [
             [
-              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+src.file \| \/.+\/ssh\s+test_user@hpc\.node\s+"sudo -u root tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
+              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+src.file \| \/.+\/ssh\s+hpc\.node\s+"sudo -u root tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
               proc { [0, '', ''] }
             ]
           ]
@@ -105,7 +105,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
         with_test_platform_for_remote_testing(
           expected_cmds: [
             [
-              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+src.file \| \/.+\/ssh\s+test_user@hpc\.node\s+"other_sudo --user root tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
+              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+src.file \| \/.+\/ssh\s+hpc\.node\s+"other_sudo --user root tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
               proc { [0, '', ''] }
             ]
           ],
@@ -119,7 +119,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
         with_test_platform_for_remote_testing(
           expected_cmds: [
             [
-              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+--owner remote_user\s+src.file \| \/.+\/ssh\s+test_user@hpc\.node\s+"tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
+              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+--owner remote_user\s+src.file \| \/.+\/ssh\s+hpc\.node\s+"tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
               proc { [0, '', ''] }
             ]
           ]
@@ -132,7 +132,7 @@ describe HybridPlatformsConductor::ActionsExecutor do
         with_test_platform_for_remote_testing(
           expected_cmds: [
             [
-              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+--group remote_group\s+src.file \| \/.+\/ssh\s+test_user@hpc\.node\s+"tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
+              /cd \/path\/to && tar\s+--create\s+--gzip\s+--file -\s+--group remote_group\s+src.file \| \/.+\/ssh\s+hpc\.node\s+"tar\s+--extract\s+--gunzip\s+--file -\s+--directory \/remote_path\/to\/dst.dir\s+--owner root\s+"/,
               proc { [0, '', ''] }
             ]
           ]

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/{config_spec.rb → config_dsl_spec.rb}

@@ -59,10 +59,10 @@ describe HybridPlatformsConductor::NodesHandler do
         '
       ) do
         expect(test_config.sudo_procs.size).to eq 2
-        expect(test_config.sudo_procs[0][:nodes_selectors_stack]). to eq []
-        expect(test_config.sudo_procs[0][:sudo_proc].call('test_user')). to eq 'alt_sudo1 -p test_user'
-        expect(test_config.sudo_procs[1][:nodes_selectors_stack]). to eq ['node2']
-        expect(test_config.sudo_procs[1][:sudo_proc].call('test_user')). to eq 'alt_sudo2 -q test_user'
+        expect(test_config.sudo_procs[0][:nodes_selectors_stack]).to eq []
+        expect(test_config.sudo_procs[0][:sudo_proc].call('test_user')).to eq 'alt_sudo1 -p test_user'
+        expect(test_config.sudo_procs[1][:nodes_selectors_stack]).to eq ['node2']
+        expect(test_config.sudo_procs[1][:sudo_proc].call('test_user')).to eq 'alt_sudo2 -q test_user'
       end
     end
 

data/spec/hybrid_platforms_conductor_test/helpers/connector_ssh_helpers.rb

@@ -10,6 +10,7 @@ module HybridPlatformsConductorTest
       # Parameters::
       # * *nodes_connections* (Hash<String, Hash<Symbol,Object> >): Nodes' connections info, per node name:
       #   * *connection* (String): Connection string (fqdn, IP...) used by SSH
+      #   * *ip* (String): IP used by SSH (can be different from connection in case of transformed SSH) [default: connection]
       #   * *user* (String): User used by SSH
       #   * *times* (Integer): Number of times this connection should be used [default: 1]
       #   * *control_master_create_error* (String or nil): Error to simulate during the SSH ControlMaster creation, or nil for none [default: nil]
@@ -33,16 +34,17 @@ module HybridPlatformsConductorTest
           ssh_commands_once = []
           ssh_commands_per_connection = []
           if with_strict_host_key_checking
+            ip = node_connection_info[:ip] || node_connection_info[:connection]
             ssh_commands_once.concat([
               [
-                "ssh-keyscan #{node_connection_info[:connection]}",
-                proc { [0, "#{node_connection_info[:connection]} ssh-rsa fake_host_key_for_#{node_connection_info[:connection]}", ''] }
+                "ssh-keyscan #{ip}",
+                proc { [0, "#{ip} ssh-rsa fake_host_key_for_#{ip}", ''] }
               ]
             ])
           end
           if with_control_master_create
             ssh_commands_per_connection << [
-              /^.+\/ssh #{with_batch_mode ? '-o BatchMode=yes ' : ''}-o ControlMaster=yes -o ControlPersist=yes #{Regexp.escape(node_connection_info[:user])}@hpc\.#{Regexp.escape(node)} true$/,
+              /^.+\/ssh #{with_batch_mode ? '-o BatchMode=yes ' : ''}-o ControlMaster=yes -o ControlPersist=yes hpc\.#{Regexp.escape(node)} true$/,
               proc do
                 control_file = test_actions_executor.connector(:ssh).send(:control_master_file, node_connection_info[:connection], '22', node_connection_info[:user])
                 # Fail if the ControlMaster file already exists, as would SSH do if the file is stalled
@@ -60,13 +62,13 @@ module HybridPlatformsConductorTest
           end
           if with_control_master_check
             ssh_commands_per_connection << [
-              /^.+\/ssh -O check #{Regexp.escape(node_connection_info[:user])}@hpc\.#{Regexp.escape(node)}$/,
+              /^.+\/ssh -O check hpc\.#{Regexp.escape(node)}$/,
               proc { [0, '', ''] }
             ]
           end
           if with_control_master_destroy
             ssh_commands_per_connection << [
-              /^.+\/ssh -O exit #{Regexp.escape(node_connection_info[:user])}@hpc\.#{Regexp.escape(node)} 2>&1 \| grep -v 'Exit request sent\.'$/,
+              /^.+\/ssh -O exit hpc\.#{Regexp.escape(node)} 2>&1 \| grep -v 'Exit request sent\.'$/,
               proc do
                 # Really mock the control file deletion
                 File.unlink(test_actions_executor.connector(:ssh).send(:control_master_file, node_connection_info[:connection], '22', node_connection_info[:user]))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 32.5.0
+  version: 32.6.0
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators
@@ -463,7 +463,7 @@ files:
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/cmdbs/platform_handlers_spec.rb
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/cmdbs_plugins_api_spec.rb
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/common_spec.rb
-- spec/hybrid_platforms_conductor_test/api/nodes_handler/config_spec.rb
+- spec/hybrid_platforms_conductor_test/api/nodes_handler/config_dsl_spec.rb
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/git_diff_impacts_spec.rb
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/nodes_selectors_spec.rb
 - spec/hybrid_platforms_conductor_test/api/nodes_handler/platform_handlers_plugins_api_spec.rb