Pull Dev Changes

Pull Dev Changes and Fix resulting conflicts Signed-off-by: Elijah Swift <elijah.swift@ibm.com>
ambitus · Oct 25, 2023 · ea0577f · ea0577f
1 parent d542dab
commit ea0577f
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 39 deletions.
diff --git a/pyracf/setropts/setropts_admin.py b/pyracf/setropts/setropts_admin.py
@@ -132,7 +132,7 @@ def refresh_raclist(self, class_names: Union[List[str], str]) -> Union[dict, byt
     # ============================================================================
     # Get attributes
     # ============================================================================
-    def get_classes_attributes(self, class_name: str) -> Union[list, bytes]:
+    def get_class_attributes(self, class_name: str) -> Union[list, bytes]:
         """Get RACF get attributes."""
         profile = self.list_racf_options(options_only=True)
         if not isinstance(profile, dict):
@@ -159,7 +159,7 @@ def remove_audit_classes(
     ) -> Union[dict, bytes]:
         """Remove class(es) from the list of classes that RACF performs auditing for."""
         result = self.alter(options={"delete:base:audit_classes": class_names})
-
+        return self._to_steps(result)
 
     # ============================================================================
     # Active Classes
@@ -220,7 +220,9 @@ def remove_generic_command_processing_classes(
         Remove class(es) from the list of classes that
         have generic profile command processing enabled.
         """
-        result = self.alter(options={"delete:base:general_command_classes": class_names})
+        result = self.alter(
+            options={"delete:base:general_command_classes": class_names}
+        )
         return self._to_steps(result)
 
     # ============================================================================
@@ -254,7 +256,9 @@ def add_generic_profile_sharing_classes(
         Add class(es) to the list of classes that are eligible for
         general resource profile sharing in common storage.
         """
-        result = self.alter(options={"base:generic_profile_sharing_classes": class_names})
+        result = self.alter(
+            options={"base:generic_profile_sharing_classes": class_names}
+        )
         return self._to_steps(result)
 
     def remove_generic_profile_sharing_classes(

diff --git a/tests/user/test_user_constants.py b/tests/user/test_user_constants.py
@@ -98,10 +98,16 @@ def get_sample(sample_file: str) -> Union[str, bytes]:
     "extract_user_result_with_command_audit_trail.xml"
 )
 TEST_EXTRACT_USER_RESULT_INVALID_ATTRIBUTE_XML = get_sample(
-    "extract_user_result_invattr_error.xml"
+    "extract_user_result_invalid_attribute_error.xml"
 )
 TEST_EXTRACT_USER_RESULT_INVALID_ATTRIBUTE_JSON = get_sample(
-    "extract_user_result_invattr_error.json"
+    "extract_user_result_invalid_attribute_error.json"
+)
+TEST_EXTRACT_USER_RESULT_BASE_OMVS_TSO_REVOKE_RESUME_XML = get_sample(
+    "extract_user_result_base_omvs_tso_revoke_resume.xml"
+)
+TEST_EXTRACT_USER_RESULT_BASE_OMVS_TSO_REVOKE_RESUME_DICTIONARY = get_sample(
+    "extract_user_result_base_omvs_tso_revoke_resume.json"
 )
 
 # Delete User
@@ -170,7 +176,6 @@ def get_sample(sample_file: str) -> Union[str, bytes]:
 TEST_ALTER_USER_REQUEST_XML = get_sample("alter_user_request.xml")
 TEST_ALTER_USER_REQUEST_TRAITS = {
     "base:special": False,
-    "base:operator": True,
     "omvs:home_directory": "/u/clarinet",
     "omvs:default_shell": False,
 }
@@ -179,8 +184,8 @@ def get_sample(sample_file: str) -> Union[str, bytes]:
     "base:owner": "leonard",
     "base:special": True,
     "omvs:uid": "2424",
-    "omvs:home": "/u/squidwrd",
-    "omvs:program": "/bin/sh",
+    "omvs:home_directory": "/u/squidwrd",
+    "omvs:default_shell": "/bin/sh",
 }
 TEST_ALTER_USER_REQUEST_TRAITS_PASSWORD = dict(TEST_ALTER_USER_REQUEST_TRAITS_EXTENDED)
 TEST_ALTER_USER_REQUEST_TRAITS_PASSWORD["base:password"] = "GIyTTqdF"

diff --git a/tests/user/user_log_samples/alter_user_additional_secret_added_error.log b/tests/user/user_log_samples/alter_user_additional_secret_added_error.log
@@ -145,7 +145,7 @@
                     "connectDate": "4/4/2023",
                     "connects": 0,
                     "uacc": null,
-                    "lastConnect": "unknown",
+                    "lastConnect": null,
                     "connectAttributes": [],
                     "revokeDate": null,
                     "resumeDate": null
@@ -191,11 +191,11 @@
       "value": "********",
       "operation": null
     },
-    "omvs:home": {
+    "omvs:home_directory": {
       "value": "/u/squidwrd",
       "operation": null
     },
-    "omvs:program": {
+    "omvs:default_shell": {
       "value": "/bin/sh",
       "operation": null
     }

diff --git a/tests/user/user_log_samples/alter_user_additional_secret_added_success.log b/tests/user/user_log_samples/alter_user_additional_secret_added_success.log
@@ -145,7 +145,7 @@
                     "connectDate": "4/4/2023",
                     "connects": 0,
                     "uacc": null,
-                    "lastConnect": "unknown",
+                    "lastConnect": null,
                     "connectAttributes": [],
                     "revokeDate": null,
                     "resumeDate": null
@@ -191,11 +191,11 @@
       "value": "********",
       "operation": null
     },
-    "omvs:home": {
+    "omvs:home_directory": {
       "value": "/u/squidwrd",
       "operation": null
     },
-    "omvs:program": {
+    "omvs:default_shell": {
       "value": "/bin/sh",
       "operation": null
     }

diff --git a/tests/user/user_log_samples/alter_user_error.log b/tests/user/user_log_samples/alter_user_error.log
@@ -145,7 +145,7 @@
                     "connectDate": "4/4/2023",
                     "connects": 0,
                     "uacc": null,
-                    "lastConnect": "unknown",
+                    "lastConnect": null,
                     "connectAttributes": [],
                     "revokeDate": null,
                     "resumeDate": null
@@ -191,11 +191,11 @@
       "value": 90000000000,
       "operation": null
     },
-    "omvs:home": {
+    "omvs:home_directory": {
       "value": "/u/squidwrd",
       "operation": null
     },
-    "omvs:program": {
+    "omvs:default_shell": {
       "value": "/bin/sh",
       "operation": null
     }

diff --git a/tests/user/user_log_samples/alter_user_passphrase_and_password_error.log b/tests/user/user_log_samples/alter_user_passphrase_and_password_error.log
@@ -145,7 +145,7 @@
                     "connectDate": "4/4/2023",
                     "connects": 0,
                     "uacc": null,
-                    "lastConnect": "unknown",
+                    "lastConnect": null,
                     "connectAttributes": [],
                     "revokeDate": null,
                     "resumeDate": null
@@ -199,11 +199,11 @@
       "value": 90000000000,
       "operation": null
     },
-    "omvs:home": {
+    "omvs:home_directory": {
       "value": "/u/squidwrd",
       "operation": null
     },
-    "omvs:program": {
+    "omvs:default_shell": {
       "value": "/bin/sh",
       "operation": null
     }

diff --git a/tests/user/user_log_samples/alter_user_passphrase_and_password_success.log b/tests/user/user_log_samples/alter_user_passphrase_and_password_success.log
@@ -145,7 +145,7 @@
                     "connectDate": "4/4/2023",
                     "connects": 0,
                     "uacc": null,
-                    "lastConnect": "unknown",
+                    "lastConnect": null,
                     "connectAttributes": [],
                     "revokeDate": null,
                     "resumeDate": null
@@ -199,11 +199,11 @@
       "value": "2424",
       "operation": null
     },
-    "omvs:home": {
+    "omvs:home_directory": {
       "value": "/u/squidwrd",
       "operation": null
     },
-    "omvs:program": {
+    "omvs:default_shell": {
       "value": "/bin/sh",
       "operation": null
     }

diff --git a/tests/user/user_log_samples/alter_user_passphrase_error.log b/tests/user/user_log_samples/alter_user_passphrase_error.log
@@ -145,7 +145,7 @@
                     "connectDate": "4/4/2023",
                     "connects": 0,
                     "uacc": null,
-                    "lastConnect": "unknown",
+                    "lastConnect": null,
                     "connectAttributes": [],
                     "revokeDate": null,
                     "resumeDate": null
@@ -195,11 +195,11 @@
       "value": 90000000000,
       "operation": null
     },
-    "omvs:home": {
+    "omvs:home_directory": {
       "value": "/u/squidwrd",
       "operation": null
     },
-    "omvs:program": {
+    "omvs:default_shell": {
       "value": "/bin/sh",
       "operation": null
     }

diff --git a/tests/user/user_log_samples/alter_user_passphrase_success.log b/tests/user/user_log_samples/alter_user_passphrase_success.log
@@ -145,7 +145,7 @@
                     "connectDate": "4/4/2023",
                     "connects": 0,
                     "uacc": null,
-                    "lastConnect": "unknown",
+                    "lastConnect": null,
                     "connectAttributes": [],
                     "revokeDate": null,
                     "resumeDate": null
@@ -195,11 +195,11 @@
       "value": "2424",
       "operation": null
     },
-    "omvs:home": {
+    "omvs:home_directory": {
       "value": "/u/squidwrd",
       "operation": null
     },
-    "omvs:program": {
+    "omvs:default_shell": {
       "value": "/bin/sh",
       "operation": null
     }

diff --git a/tests/user/user_log_samples/alter_user_password_error.log b/tests/user/user_log_samples/alter_user_password_error.log
@@ -145,7 +145,7 @@
                     "connectDate": "4/4/2023",
                     "connects": 0,
                     "uacc": null,
-                    "lastConnect": "unknown",
+                    "lastConnect": null,
                     "connectAttributes": [],
                     "revokeDate": null,
                     "resumeDate": null
@@ -195,11 +195,11 @@
       "value": 90000000000,
       "operation": null
     },
-    "omvs:home": {
+    "omvs:home_directory": {
       "value": "/u/squidwrd",
       "operation": null
     },
-    "omvs:program": {
+    "omvs:default_shell": {
       "value": "/bin/sh",
       "operation": null
     }

diff --git a/tests/user/user_log_samples/alter_user_password_success.log b/tests/user/user_log_samples/alter_user_password_success.log
@@ -145,7 +145,7 @@
                     "connectDate": "4/4/2023",
                     "connects": 0,
                     "uacc": null,
-                    "lastConnect": "unknown",
+                    "lastConnect": null,
                     "connectAttributes": [],
                     "revokeDate": null,
                     "resumeDate": null
@@ -195,11 +195,11 @@
       "value": "2424",
       "operation": null
     },
-    "omvs:home": {
+    "omvs:home_directory": {
       "value": "/u/squidwrd",
       "operation": null
     },
-    "omvs:program": {
+    "omvs:default_shell": {
       "value": "/bin/sh",
       "operation": null
     }

diff --git a/tests/user/user_log_samples/alter_user_success.log b/tests/user/user_log_samples/alter_user_success.log
@@ -145,7 +145,7 @@
                     "connectDate": "4/4/2023",
                     "connects": 0,
                     "uacc": null,
-                    "lastConnect": "unknown",
+                    "lastConnect": null,
                     "connectAttributes": [],
                     "revokeDate": null,
                     "resumeDate": null
@@ -179,11 +179,11 @@
     }
   },
   "omvs": {
-    "omvs:home": {
+    "omvs:home_directory": {
       "value": "/u/clarinet",
       "operation": null
     },
-    "omvs:program": {
+    "omvs:default_shell": {
       "value": false,
       "operation": "delete"
     }

diff --git a/...es/extract_user_result_invattr_error.json → ..._user_result_invalid_attribute_error.json b/...es/extract_user_result_invattr_error.json → ..._user_result_invalid_attribute_error.json
diff --git a/...les/extract_user_result_invattr_error.xml → ...t_user_result_invalid_attribute_error.xml b/...les/extract_user_result_invattr_error.xml → ...t_user_result_invalid_attribute_error.xml