feat: update pytest-mh output to work with latest version

neoave · Aug 6, 2024 · b3e0f7d · b3e0f7d
1 parent 079c3dc
commit b3e0f7d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/mrack/outputs/pytest_mh.py b/src/mrack/outputs/pytest_mh.py
@@ -67,19 +67,20 @@ def create_mh_config(self):
                         "family": get_os_type(host),
                     },
                     "role": host["role"],
-                    "ssh": {
+                    "conn": {
+                        "type": "ssh",
                         "host": get_external_id(provisioned_host, host, self._config),
                     },
                 }
 
                 if get_os_type(host) == "windows":
                     username = get_username(provisioned_host, host, self._config)
                     if username:
-                        hostcfg["ssh"]["username"] = username
+                        hostcfg["conn"]["username"] = username
 
                     password = get_password(provisioned_host, host, self._config)
                     if password:
-                        hostcfg["ssh"]["password"] = password
+                        hostcfg["conn"]["password"] = password
 
                 cfgdom["hosts"].append(merge_dict(hostcfg, host.get("pytest_mh", {})))
 

diff --git a/tests/unit/test_pytest_mh.py b/tests/unit/test_pytest_mh.py
@@ -39,7 +39,8 @@ def mock_metadata():
         role: ipa
         os: fedora-37
         pytest_mh:
-          ssh:
+          conn:
+            type: ssh
             username: tuser
             password: tuserpassword
           config:
@@ -77,7 +78,8 @@ def test_output(self, mock_metadata, mock_gethostbyaddr):
             os:
               family: linux
             role: client
-            ssh:
+            conn:
+              type: ssh
               host: 192.168.0.1
             artifacts:
             - /etc/sssd/*
@@ -87,7 +89,8 @@ def test_output(self, mock_metadata, mock_gethostbyaddr):
             os:
               family: linux
             role: ipa
-            ssh:
+            conn:
+              type: ssh
               host: 192.168.0.1
               username: tuser
               password: tuserpassword
@@ -100,7 +103,8 @@ def test_output(self, mock_metadata, mock_gethostbyaddr):
             os:
               family: windows
             role: ad
-            ssh:
+            conn:
+              type: ssh
               host: 192.168.0.1
               username: Administrator
               password: adpassword