Change Setropts Trait names to match

Changed to "maxSessionKeyInterval" and "base:max_session_key_interval" where appropriate. also change vtam header to appc and appcTransactionAudit to transactionAudit since it is within the APPC header. Signed-off-by: Elijah Swift <elijah.swift@ibm.com>
ambitus · Nov 15, 2023 · f7b5c17 · f7b5c17
1 parent 84f10ed
commit f7b5c17
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/pyracf/setropts/setropts_admin.py b/pyracf/setropts/setropts_admin.py
@@ -93,7 +93,7 @@ def __init__(
                 "base:log_commands_issuesd_by_special_users": "racf:saudit",
                 "base:security_label_control": "racf:seclabct",
                 "base:secondary_language": "racf:seclang",
-                "base:session_key_verification_interval": "racf:sessint",
+                "base:max_session_key_interval": "racf:sessint",
                 "base:security_label_auditing": "racf:slabaudt",
                 "base:security_label_system": "racf:slbysys",
                 "base:security_level_auditing": "racf:slevaudt",
@@ -104,6 +104,9 @@ def __init__(
                 "base:program_control": "racf:whenprog",
             }
         }
+        self._extracted_key_value_pair_segment_traits_map = {
+            "base": {" session key verification interval": "maxSessionKeyInterval"}
+        }
         super().__init__(
             "systemSettings",
             debug=debug,
@@ -462,13 +465,13 @@ def _format_profile(self, result: dict) -> None:
             )
             .replace(
                 "PARTNER LU-VERIFICATION SESSIONKEY INTERVAL MAXIMUM/DEFAULT",
-                "VTAM SESSION KEY VERIFICATION INTERVAL",
+                "APPC SESSION KEY VERIFICATION INTERVAL",
             )
             .replace(
                 "PARTNER LU-VERIFICATION SESSIONKEY INTERVAL DEFAULT",
-                "VTAM SESSION KEY VERIFICATION INTERVAL",
+                "APPC SESSION KEY VERIFICATION INTERVAL",
             )
-            .replace("APPLAUDIT", "VTAM APPC TRANSACTION AUDIT")
+            .replace("APPLAUDIT", "APPC TRANSACTION AUDIT")
             .splitlines()
         )
         # Merge multi-line fields into single line based on key-value relationship token.
@@ -521,7 +524,7 @@ def _format_profile(self, result: dict) -> None:
             "LANGUAGE DEFAULT": "languageDefaults",
             "DATA SET": "dataSets",
             "SECURITY LABEL": "securityLabels",
-            "VTAM": "vtam",
+            "APPC": "appc",
             "KERBEROS": "kerberos",
             "GENERIC RULES": "genericRules",
             "GROUP RULES": "groupRules",

diff --git a/tests/setropts/setropts_log_samples/list_setropts_success.log b/tests/setropts/setropts_log_samples/list_setropts_success.log
@@ -956,8 +956,8 @@
                 "interprocessCommunications": false,
                 "nameHiding": false
               },
-              "vtam": {
-                "sessionKeyVerificationInterval": 30
+              "appc": {
+                "maxSessionKeyInterval": 30
               },
               "kerberos": {
                 "encryptionLevel": 0

diff --git a/tests/setropts/setropts_log_samples/list_setropts_success_2.log b/tests/setropts/setropts_log_samples/list_setropts_success_2.log
@@ -561,9 +561,9 @@
                 "interprocessCommunications": true,
                 "nameHiding": false
               },
-              "vtam": {
-                "sessionKeyVerificationInterval": 30,
-                "appcTransactionAudit": true
+              "appc": {
+                "maxSessionKeyInterval": 30,
+                "transactionAudit": true
               },
               "kerberos": {
                 "encryptionLevel": 0

diff --git a/tests/setropts/setropts_log_samples/list_setropts_success_3.log b/tests/setropts/setropts_log_samples/list_setropts_success_3.log
@@ -2017,9 +2017,9 @@
                 "interprocessCommunications": false,
                 "nameHiding": false
               },
-              "vtam": {
-                "sessionKeyVerificationInterval": null,
-                "appcTransactionAudit": false
+              "appc": {
+                "maxSessionKeyInterval": null,
+                "transactionAudit": false
               },
               "kerberos": {
                 "encryptionLevel": 0

diff --git a/tests/setropts/setropts_result_samples/list_setropts_result_success.json b/tests/setropts/setropts_result_samples/list_setropts_result_success.json
@@ -614,8 +614,8 @@
                 "interprocessCommunications": false,
                 "nameHiding": false
               },
-              "vtam": {
-                "sessionKeyVerificationInterval": 30
+              "appc": {
+                "maxSessionKeyInterval": 30
               },
               "kerberos": {
                 "encryptionLevel": 0

diff --git a/tests/setropts/setropts_result_samples/list_setropts_result_success_2.json b/tests/setropts/setropts_result_samples/list_setropts_result_success_2.json
@@ -301,9 +301,9 @@
                 "interprocessCommunications": true,
                 "nameHiding": false
               },
-              "vtam": {
-                "sessionKeyVerificationInterval": 30,
-                "appcTransactionAudit": true
+              "appc": {
+                "maxSessionKeyInterval": 30,
+                "transactionAudit": true
               },
               "kerberos": {
                 "encryptionLevel": 0

diff --git a/tests/setropts/setropts_result_samples/list_setropts_result_success_3.json b/tests/setropts/setropts_result_samples/list_setropts_result_success_3.json
@@ -1407,9 +1407,9 @@
                 "interprocessCommunications": false,
                 "nameHiding": false
               },
-              "vtam": {
-                "sessionKeyVerificationInterval": null,
-                "appcTransactionAudit": false
+              "appc": {
+                "maxSessionKeyInterval": null,
+                "transactionAudit": false
               },
               "kerberos": {
                 "encryptionLevel": 0