Support for logon/logoff and named sessions

TODOs: * Testcases for _session_file.py module * Testcases for _cmd_session.py module Details: * Added new 'zhmc session logon/logoff' commands that manage the session in a file '.zhmc_sessions.yaml' in the user's home directory. * Deprecated the existing 'zhmc session create/delete' commands since they are less convenient to use compared to the new logon/logoff commands, and cannot be used as intended on Windows due to the displayed export/unset commands. * Added a general option '-s' / '--session-name' for specifying the name of the session that is managed in the '.zhmc_sessions.yaml' file. This allows having multiple sessions to different HMCs open at the same time, and selecting them by name. If not specified, the session name is 'default'. * The 'session delete' command was changed to unset all ZHMC_* environment variables, instead of just ZHMC_SESSION_ID. * If logon options and ZHMC_* environment variables are both specified, the logon options now have precedence and none of the ZHMC_* environment variables is used (except ZHMC_PASSWORD). This changes the earlier behavior where ZHMC_SESSION_ID was used even when logon options were specified. * The existing testcases for sessions were adjusted for the new behavior. * The end2end testcases for sessions were extended with new testcases. Signed-off-by: Andreas Maier <[email protected]>
zhmcclient · Dec 29, 2024 · 82974eb · 82974eb
1 parent b70aed0
commit 82974eb
Show file tree

Hide file tree

Showing 13 changed files with 1,253 additions and 107 deletions.
diff --git a/changes/544.2.feature.rst b/changes/544.2.feature.rst
@@ -0,0 +1,2 @@
+Added support for creating multiple named sessions with a new global option
+'-s' / '--session-name'.
diff --git a/changes/544.deprecation.rst b/changes/544.deprecation.rst
@@ -0,0 +1,4 @@
+The 'zhmc session create/delete' commands are now deprecated. They were
+inconvenient to use and did not support Windows out of the box since they
+displayed the export/unset commands to manage the session. Use the new
+'zhmc session logon/logoff' commands instead.
diff --git a/changes/544.feature.rst b/changes/544.feature.rst
@@ -0,0 +1,6 @@
+New 'zhmc session logon/logoff' commands are provided. They manage the session
+in a '.zhmc_sessions.yaml' file in the user's home directory. This is more
+convenient for users compared to the existing 'zhmc session create/delete'
+commands which store the session in environment variables and display the
+export/unset commands to do that. The new commands also support Windows out
+of the box.
diff --git a/changes/544.incompatible.rst b/changes/544.incompatible.rst
@@ -0,0 +1,5 @@
+If logon options and ZHMC_* environment variables are both provided, the
+logon options now take precedence, and the environment variables are ignored.
+As a result, a provided ZHMC_SESSION_ID variable is now ignored when logon
+options are also provided. Previously, a provided ZHMC_SESSION_ID variable was
+used when logon options were also provided.
diff --git a/tests/end2end/test_session.py b/tests/end2end/test_session.py
@@ -143,8 +143,16 @@ def assert_session_delete(
                 continue
             raise AssertionError(f"Unexpected line on stdout: {line!r}")
 
+        assert 'ZHMC_HOST' in unset_vars
+        del unset_vars['ZHMC_HOST']
+        assert 'ZHMC_USERID' in unset_vars
+        del unset_vars['ZHMC_USERID']
         assert 'ZHMC_SESSION_ID' in unset_vars
         del unset_vars['ZHMC_SESSION_ID']
+        assert 'ZHMC_NO_VERIFY' in unset_vars
+        del unset_vars['ZHMC_NO_VERIFY']
+        assert 'ZHMC_CA_CERTS' in unset_vars
+        del unset_vars['ZHMC_CA_CERTS']
 
         assert not export_vars
         assert not unset_vars
@@ -371,6 +379,17 @@ def test_utils_invalid_session(hmc_definition):  # noqa: F811
         0, None,
         True
     ),
+    (
+        "no env vars and logon opts with only -h",
+        # If logon opts are used (detected by presence of -h), a userid is
+        # required.
+        {},
+        {
+            '-h': 'valid',
+        },
+        1, "Required option not specified: --userid",
+        True
+    ),
     (
         "no env vars and logon opts with invalid pw",
         # Since there is no session ID in the env vars, a new session is created
@@ -394,7 +413,7 @@ def test_utils_invalid_session(hmc_definition):  # noqa: F811
             'ZHMC_SESSION_ID': 'valid',
         },
         {},
-        1, 'No HMC host provided',
+        1, 'No HMC host or session in HMC session file provided',
         True
     ),
     (
@@ -436,7 +455,7 @@ def test_utils_invalid_session(hmc_definition):  # noqa: F811
     ),
     (
         "all env vars (valid session) and valid logon opts",
-        # The valid session in the env var is successfully deleted on the HMC.
+        # The logon opts take precedence.
         # A new session is created on the HMC, using the valid password.
         {
             'ZHMC_HOST': 'valid',
@@ -568,9 +587,16 @@ def test_session_create(
                               exp_rc, exp_err, pdb_)
 
         # If a valid session ID was provided to the command in env vars,
-        # verify that that session was deleted on the HMC
+        # verify the state of its session on the HMC.
         if env_session_id and rc == 0:
-            assert not is_valid_hmc_session(hmc_definition, env_session_id)
+            if '-h' in logon_opts or '--host' in logon_opts:
+                # logon options take precedence over env vars, so the
+                # session ID in the env vars was ignored and is still valid.
+                assert is_valid_hmc_session(hmc_definition, env_session_id)
+            else:
+                # logon was done from the env vars, and the session provided
+                # in the env vars was deleted.
+                assert not is_valid_hmc_session(hmc_definition, env_session_id)
 
     finally:
         for session_id in cleanup_session_ids:
@@ -635,6 +661,17 @@ def test_session_create(
         0, None,
         True
     ),
+    (
+        "no env vars and logon opts with only -h",
+        # If logon opts are used (detected by presence of -h), a userid is
+        # required.
+        {},
+        {
+            '-h': 'valid',
+        },
+        1, "Required option not specified: --userid",
+        True
+    ),
     (
         "no env vars and logon opts with invalid pw",
         # Since there is no session ID in the env vars, no session will be
@@ -658,7 +695,7 @@ def test_session_create(
             'ZHMC_SESSION_ID': 'valid',
         },
         {},
-        1, 'No HMC host provided',
+        1, 'No HMC host or session in HMC session file provided',
         True
     ),
     (
@@ -817,9 +854,16 @@ def test_session_delete(
                               exp_rc, exp_err, pdb_)
 
         # If a valid session ID was provided to the command in env vars,
-        # verify that that session was deleted on the HMC
+        # verify the state of its session on the HMC.
         if env_session_id and rc == 0:
-            assert not is_valid_hmc_session(hmc_definition, env_session_id)
+            if '-h' in logon_opts or '--host' in logon_opts:
+                # logon options take precedence over env vars, so the
+                # session ID in the env vars was ignored and is still valid.
+                assert is_valid_hmc_session(hmc_definition, env_session_id)
+            else:
+                # logon was done from the env vars, and the session provided
+                # in the env vars was deleted.
+                assert not is_valid_hmc_session(hmc_definition, env_session_id)
 
     finally:
         for session_id in cleanup_session_ids:
@@ -886,6 +930,17 @@ def test_session_delete(
         0, None,
         True
     ),
+    (
+        "no env vars and logon opts with only -h",
+        # If logon opts are used (detected by presence of -h), a userid is
+        # required.
+        {},
+        {
+            '-h': 'valid',
+        },
+        1, "Required option not specified: --userid",
+        True
+    ),
     (
         "no env vars and logon opts with invalid pw",
         # Since there is no session ID in the env vars, a new session is created
@@ -909,7 +964,7 @@ def test_session_delete(
             'ZHMC_SESSION_ID': 'valid',
         },
         {},
-        1, 'No HMC host provided',
+        1, 'No HMC host or session in HMC session file provided',
         True
     ),
     (
@@ -950,9 +1005,9 @@ def test_session_delete(
     ),
     (
         "all env vars (valid session) and valid logon opts",
-        # The valid session ID in the env vars is used to execute the command
-        # on the HMC. The session is not deleted after the command. The
-        # credentials in the options are not used.
+        # Logon options take precedence over env vars, so the valid session ID
+        # in the env vars is ignored, and the logon opts are used to create a
+        # new session on the HMC.
         {
             'ZHMC_HOST': 'valid',
             'ZHMC_USERID': 'valid',
@@ -972,12 +1027,9 @@ def test_session_delete(
     ),
     (
         "all env vars (invalid session) and valid logon opts",
-        # The invalid session ID in the env vars is attempted to be used to
-        # execute the command, which fails, which causes a session renewal.
-        # A new session is created on the HMC using the valid password,
-        # and then the command is successfully executed. The session is
-        # deleted after the command (because it cannot be stored for reuse
-        # anyway).
+        # Logon options take precedence over env vars, so the invalid session ID
+        # in the env vars is ignored, and the logon opts are used to create a
+        # new session on the HMC.
         {
             'ZHMC_HOST': 'valid',
             'ZHMC_USERID': 'valid',
@@ -997,10 +1049,9 @@ def test_session_delete(
     ),
     (
         "all env vars (valid session) and logon opts with invalid pw",
-        # The valid session ID in the env vars is used to execute the command
-        # on the HMC. The session is not deleted after the command. The
-        # credentials in the options are not used, so it does not matter
-        # that the password is invalid.
+        # Logon options take precedence over env vars, so the valid session ID
+        # in the env vars is ignored, and the logon opts are used to create a
+        # new session on the HMC, which fails due to the invalid password.
         {
             'ZHMC_HOST': 'valid',
             'ZHMC_USERID': 'valid',
@@ -1015,15 +1066,14 @@ def test_session_delete(
             '-n': 'valid',
             '-c': 'valid',
         },
-        0, None,
+        1, "ServerAuthError: HTTP authentication failed with 403,0",
         True
     ),
     (
         "all env vars (invalid session) and logon opts with invalid pw",
-        # The invalid session ID in the env vars is attempted to be used to
-        # execute the command, which fails, which causes a session renewal.
-        # A new session is attempted to be created on the HMC using the invalid
-        # password, which fails.
+        # Logon options take precedence over env vars, so the invalid session ID
+        # in the env vars is ignored, and the logon opts are used to create a
+        # new session on the HMC, which fails due to the invalid password.
         {
             'ZHMC_HOST': 'valid',
             'ZHMC_USERID': 'valid',

diff --git a/tests/function/test_info.py b/tests/function/test_info.py
@@ -70,7 +70,7 @@ def test_info_error_no_host(self):
         assert_rc(1, rc, stdout, stderr)
         assert stdout == ""
         assert stderr.startswith(
-            "Error: No HMC host provided\n"), \
+            "Error: No HMC host or session in HMC session file provided\n"), \
             f"stderr={stderr!r}"
 
     def test_info_error_no_conn(self):
@@ -80,7 +80,7 @@ def test_info_error_no_conn(self):
         # Invoke the command to be tested
         rc, stdout, stderr = call_zhmc_child(
             ['info'],
-            {'ZHMC_HOST': 'invalid_host'}
+            {'ZHMC_HOST': 'invalid_host', 'ZHMC_USERID': 'user'}
         )
 
         assert_rc(1, rc, stdout, stderr)
@@ -205,7 +205,8 @@ def test_option_outputformat_table(
         """
 
         faked_session = FakedSession(
-            'fake-host', hmc_name, hmc_version, api_version)
+            'fake-host', hmc_name, hmc_version, api_version,
+            userid='fake-user')
         api_version_parts = [int(vp) for vp in api_version.split('.')]
         exp_values = {
             'hnam': hmc_name,
@@ -266,7 +267,8 @@ def test_option_outputformat_json(
         """
 
         faked_session = FakedSession(
-            'fake-host', hmc_name, hmc_version, api_version)
+            'fake-host', hmc_name, hmc_version, api_version,
+            userid='fake-user')
 
         args = [out_opt, 'json']
         if transpose_opt is not None:
@@ -325,7 +327,7 @@ def test_option_errorformat(self, err_opt, err_format, exp_stderr_patterns):
         # Invoke the command to be tested
         rc, stdout, stderr = call_zhmc_child(
             err_args + ['info'],
-            {'ZHMC_HOST': 'invalid_host'}
+            {'ZHMC_HOST': 'invalid_host', 'ZHMC_USERID': 'user'}
         )
 
         assert_rc(1, rc, stdout, stderr)
@@ -371,7 +373,8 @@ def test_option_log(
         """Test 'zhmc info' with global option --log"""
 
         faked_session = FakedSession(
-            'fake-host', hmc_name, hmc_version, api_version)
+            'fake-host', hmc_name, hmc_version, api_version,
+            userid='fake-user')
 
         # Invoke the command to be tested
         rc, stdout, stderr = call_zhmc_inline(
@@ -404,7 +407,8 @@ def test_option_logdest(
         """Test 'zhmc info' with global option --log-dest (and --log)"""
 
         faked_session = FakedSession(
-            'fake-host', hmc_name, hmc_version, api_version)
+            'fake-host', hmc_name, hmc_version, api_version,
+            userid='fake-user')
 
         args = ['--log', 'api=debug']
         logger_name = 'zhmcclient.api'  # corresponds to --log option

diff --git a/tests/function/utils.py b/tests/function/utils.py
@@ -166,10 +166,6 @@ def call_zhmc_inline(args, env=None, faked_session=None):
         env = copy(env)
 
     # Unset the zhmc-specific env vars if not provided
-    if 'ZHMC_HOST' not in env:
-        env['ZHMC_HOST'] = None
-    if 'ZHMC_USERID' not in env:
-        env['ZHMC_USERID'] = None
     if faked_session:
         # Communicate the faked session object to the zhmc CLI code.
         # It is accessed in CmdContext.execute_cmd().
@@ -179,7 +175,13 @@ def call_zhmc_inline(args, env=None, faked_session=None):
         session_id = 'faked_session:{s}'.format(
             s='zhmcclient_mock.zhmccli_faked_session')
         env['ZHMC_SESSION_ID'] = session_id
+        env['ZHMC_HOST'] = faked_session.host
+        env['ZHMC_USERID'] = faked_session.userid
     else:
+        if 'ZHMC_HOST' not in env:
+            env['ZHMC_HOST'] = None
+        if 'ZHMC_USERID' not in env:
+            env['ZHMC_USERID'] = None
         if 'ZHMC_SESSION_ID' not in env:
             env['ZHMC_SESSION_ID'] = None
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Added support for creating multiple named sessions with a new global option
		'-s' / '--session-name'.