diff --git a/tests/common/common_log_samples/alter_data_set_additional_secret_added_error.log b/tests/common/common_log_samples/alter_data_set_additional_secret_added_error.log new file mode 100644 index 00000000..9900478a --- /dev/null +++ b/tests/common/common_log_samples/alter_data_set_additional_secret_added_error.log @@ -0,0 +1,268 @@ + + [pyRACF:Debug] + Request Dictionary + DataSetAdmin.alter() + + +{} + + + [pyRACF:Debug] + Request XML + DataSetAdmin.alter() + + + + + + + + [pyRACF:Debug] + Result XML + DataSetAdmin.alter() + + + + + + + 0 + 0 + 0 + LISTDSD DATASET ('ESWIFT.TEST.T1136242.P3020470') + INFORMATION FOR DATASET ESWIFT.TEST.T1136242.P3020470 + + LEVEL OWNER UNIVERSAL ACCESS WARNING ERASE + ----- -------- ---------------- ------- ----- + 00 ESWIFT READ NO NO + + AUDITING + -------- + FAILURES(READ) + + NOTIFY + -------- + NO USER TO BE NOTIFIED + + YOUR ACCESS CREATION GROUP DATASET TYPE + ----------- -------------- ------------ + ALTER SYS1 NON-VSAM + + VOLUMES ON WHICH DATASET RESIDES + -------------------------------- + USRAT2 + + NO INSTALLATION DATA + + + 0 + 0 + + + + [pyRACF:Debug] + Result Dictionary + DataSetAdmin.alter() + + +{ + "securityResult": { + "dataSet": { + "name": "ESWIFT.TEST.T1136242.P3020470", + "operation": "listdata", + "generic": "no", + "requestId": "DatasetRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "LISTDSD DATASET ('ESWIFT.TEST.T1136242.P3020470')", + "messages": [ + "INFORMATION FOR DATASET ESWIFT.TEST.T1136242.P3020470", + null, + "LEVEL OWNER UNIVERSAL ACCESS WARNING ERASE", + "----- -------- ---------------- ------- -----", + " 00 ESWIFT READ NO NO", + null, + "AUDITING", + "--------", + "FAILURES(READ)", + null, + "NOTIFY", + "--------", + "NO USER TO BE NOTIFIED", + null, + "YOUR ACCESS CREATION GROUP DATASET TYPE", + "----------- -------------- ------------", + " ALTER SYS1 NON-VSAM", + null, + "VOLUMES ON WHICH DATASET RESIDES", + "--------------------------------", + "USRAT2", + null, + "NO INSTALLATION DATA" + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Result Dictionary (Formatted Profile) + DataSetAdmin.alter() + + +{ + "securityResult": { + "dataSet": { + "name": "ESWIFT.TEST.T1136242.P3020470", + "operation": "listdata", + "generic": "no", + "requestId": "DatasetRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "LISTDSD DATASET ('ESWIFT.TEST.T1136242.P3020470')", + "profiles": [ + { + "base": { + "name": "eswift.test.t1136242.p3020470", + "level": 0, + "owner": "eswift", + "universalAccess": "read", + "warning": null, + "erase": null, + "auditing": { + "failures": "read" + }, + "notify": null, + "yourAccess": "alter", + "creationGroup": "sys1", + "dataSetType": "non-vsam", + "volumes": [ + "usrat2" + ], + "installationData": null, + "generic": false + } + } + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Request Dictionary + DataSetAdmin.alter() + + +{ + "base": { + "base:universal_access": { + "value": "********", + "operation": null + }, + "base:owner": { + "value": "eswift", + "operation": null + } + } +} + + + [pyRACF:Debug] + Request XML + DataSetAdmin.alter() + + + + + + ******** + eswift + + + + + + [pyRACF:Debug] + Result XML + DataSetAdmin.alter() + + + + + + + 8 + 16 + 4 + ADDSD ('ESWIFT.TEST.T113622.P3020470') + ICH09005I ESWIFT.TEST.T113622.P3020470 NOT FOUND IN CATALOG + + + 8 + 16 + 4 + ALTDSD ('ESWIFT.TEST.T113622.P3020470') UACC (********) + ICH22001I ESWIFT.TEST.T113622.P3020470 NOT DEFINED TO RACF + + + 4 + 0 + + + + [pyRACF:Debug] + Result Dictionary + DataSetAdmin.alter() + + +{ + "securityResult": { + "dataSet": { + "name": "ESWIFT.TEST.T113622.P3020470", + "operation": "set", + "generic": "no", + "requestId": "DatasetRequest", + "commands": [ + { + "safReturnCode": 8, + "returnCode": 16, + "reasonCode": 4, + "image": "ADDSD ('ESWIFT.TEST.T113622.P3020470')", + "messages": [ + "ICH09005I ESWIFT.TEST.T113622.P3020470 NOT FOUND IN CATALOG" + ] + }, + { + "safReturnCode": 8, + "returnCode": 16, + "reasonCode": 4, + "image": "ALTDSD ('ESWIFT.TEST.T113622.P3020470') UACC (********)", + "messages": [ + "ICH22001I ESWIFT.TEST.T113622.P3020470 NOT DEFINED TO RACF" + ] + } + ] + }, + "returnCode": 4, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + diff --git a/tests/common/common_log_samples/alter_data_set_additional_secret_added_success.log b/tests/common/common_log_samples/alter_data_set_additional_secret_added_success.log new file mode 100644 index 00000000..af803124 --- /dev/null +++ b/tests/common/common_log_samples/alter_data_set_additional_secret_added_success.log @@ -0,0 +1,252 @@ + + [pyRACF:Debug] + Request Dictionary + DataSetAdmin.alter() + + +{} + + + [pyRACF:Debug] + Request XML + DataSetAdmin.alter() + + + + + + + + [pyRACF:Debug] + Result XML + DataSetAdmin.alter() + + + + + + + 0 + 0 + 0 + LISTDSD DATASET ('ESWIFT.TEST.T1136242.P3020470') + INFORMATION FOR DATASET ESWIFT.TEST.T1136242.P3020470 + + LEVEL OWNER UNIVERSAL ACCESS WARNING ERASE + ----- -------- ---------------- ------- ----- + 00 ESWIFT READ NO NO + + AUDITING + -------- + FAILURES(READ) + + NOTIFY + -------- + NO USER TO BE NOTIFIED + + YOUR ACCESS CREATION GROUP DATASET TYPE + ----------- -------------- ------------ + ALTER SYS1 NON-VSAM + + VOLUMES ON WHICH DATASET RESIDES + -------------------------------- + USRAT2 + + NO INSTALLATION DATA + + + 0 + 0 + + + + [pyRACF:Debug] + Result Dictionary + DataSetAdmin.alter() + + +{ + "securityResult": { + "dataSet": { + "name": "ESWIFT.TEST.T1136242.P3020470", + "operation": "listdata", + "generic": "no", + "requestId": "DatasetRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "LISTDSD DATASET ('ESWIFT.TEST.T1136242.P3020470')", + "messages": [ + "INFORMATION FOR DATASET ESWIFT.TEST.T1136242.P3020470", + null, + "LEVEL OWNER UNIVERSAL ACCESS WARNING ERASE", + "----- -------- ---------------- ------- -----", + " 00 ESWIFT READ NO NO", + null, + "AUDITING", + "--------", + "FAILURES(READ)", + null, + "NOTIFY", + "--------", + "NO USER TO BE NOTIFIED", + null, + "YOUR ACCESS CREATION GROUP DATASET TYPE", + "----------- -------------- ------------", + " ALTER SYS1 NON-VSAM", + null, + "VOLUMES ON WHICH DATASET RESIDES", + "--------------------------------", + "USRAT2", + null, + "NO INSTALLATION DATA" + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Result Dictionary (Formatted Profile) + DataSetAdmin.alter() + + +{ + "securityResult": { + "dataSet": { + "name": "ESWIFT.TEST.T1136242.P3020470", + "operation": "listdata", + "generic": "no", + "requestId": "DatasetRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "LISTDSD DATASET ('ESWIFT.TEST.T1136242.P3020470')", + "profiles": [ + { + "base": { + "name": "eswift.test.t1136242.p3020470", + "level": 0, + "owner": "eswift", + "universalAccess": "read", + "warning": null, + "erase": null, + "auditing": { + "failures": "read" + }, + "notify": null, + "yourAccess": "alter", + "creationGroup": "sys1", + "dataSetType": "non-vsam", + "volumes": [ + "usrat2" + ], + "installationData": null, + "generic": false + } + } + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Request Dictionary + DataSetAdmin.alter() + + +{ + "base": { + "base:universal_access": { + "value": "Read", + "operation": null + }, + "base:owner": { + "value": "********", + "operation": null + } + } +} + + + [pyRACF:Debug] + Request XML + DataSetAdmin.alter() + + + + + + Read + ******** + + + + + + [pyRACF:Debug] + Result XML + DataSetAdmin.alter() + + + + + + Definition exists. Add command skipped due to precheck option + + 0 + 0 + 0 + ALTDSD ('ESWIFT.TEST.T1136242.P3020470') UACC (Read) OWNER (********) + + + 0 + 0 + + + + [pyRACF:Debug] + Result Dictionary + DataSetAdmin.alter() + + +{ + "securityResult": { + "dataSet": { + "name": "ESWIFT.TEST.T1136242.P3020470", + "operation": "set", + "generic": "no", + "requestId": "DatasetRequest", + "info": [ + "Definition exists. Add command skipped due to precheck option" + ], + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "ALTDSD ('ESWIFT.TEST.T1136242.P3020470') UACC (Read) OWNER (********)" + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + diff --git a/tests/common/common_log_samples/alter_group_additional_secret_added_error.log b/tests/common/common_log_samples/alter_group_additional_secret_added_error.log new file mode 100644 index 00000000..1a5a033f --- /dev/null +++ b/tests/common/common_log_samples/alter_group_additional_secret_added_error.log @@ -0,0 +1,246 @@ + + [pyRACF:Debug] + Request Dictionary + GroupAdmin.alter() + + +{} + + + [pyRACF:Debug] + Request XML + GroupAdmin.alter() + + + + + + + + [pyRACF:Debug] + Result XML + GroupAdmin.alter() + + + + + + + 0 + 0 + 0 + LISTGRP TESTGRP0 + INFORMATION FOR GROUP TESTGRP0 + SUPERIOR GROUP=SYS1 OWNER=ESWIFT CREATED=23.150 + NO INSTALLATION DATA + NO MODEL DATA SET + TERMUACC + NO SUBGROUPS + USER(S)= ACCESS= ACCESS COUNT= UNIVERSAL ACCESS= + ESWIFT USE 000000 NONE + CONNECT ATTRIBUTES=SPECIAL + REVOKE DATE=NONE RESUME DATE=NONE + LEONARD USE 000000 NONE + CONNECT ATTRIBUTES=OPERATIONS + REVOKE DATE=NONE RESUME DATE=NONE + + + 0 + 0 + + + + [pyRACF:Debug] + Result Dictionary + GroupAdmin.alter() + + +{ + "securityResult": { + "group": { + "name": "testgrp0", + "operation": "listdata", + "requestId": "GroupRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "LISTGRP TESTGRP0 ", + "messages": [ + "INFORMATION FOR GROUP TESTGRP0", + " SUPERIOR GROUP=SYS1 OWNER=ESWIFT CREATED=23.150", + " NO INSTALLATION DATA", + " NO MODEL DATA SET", + " TERMUACC", + " NO SUBGROUPS", + " USER(S)= ACCESS= ACCESS COUNT= UNIVERSAL ACCESS=", + " ESWIFT USE 000000 NONE", + " CONNECT ATTRIBUTES=SPECIAL", + " REVOKE DATE=NONE RESUME DATE=NONE", + " LEONARD USE 000000 NONE", + " CONNECT ATTRIBUTES=OPERATIONS", + " REVOKE DATE=NONE RESUME DATE=NONE" + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Result Dictionary (Formatted Profile) + GroupAdmin.alter() + + +{ + "securityResult": { + "group": { + "name": "testgrp0", + "operation": "listdata", + "requestId": "GroupRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "LISTGRP TESTGRP0 ", + "profiles": [ + { + "base": { + "name": "testgrp0", + "superiorGroup": "sys1", + "owner": "eswift", + "created": "5/30/2023", + "installationData": null, + "modelDataSet": null, + "terminalUniversalAccess": true, + "subgroups": [], + "users": [ + { + "userid": "eswift", + "access": "use", + "accessCount": 0, + "universalAccess": null, + "connectAttributes": [ + "special" + ], + "revokeDate": null, + "resumeDate": null + }, + { + "userid": "leonard", + "access": "use", + "accessCount": 0, + "universalAccess": null, + "connectAttributes": [ + "operations" + ], + "revokeDate": null, + "resumeDate": null + } + ] + } + } + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Request Dictionary + GroupAdmin.alter() + + +{ + "omvs": { + "omvs:gid": { + "value": "********", + "operation": null + } + } +} + + + [pyRACF:Debug] + Request XML + GroupAdmin.alter() + + + + + + ******** + + + + + + [pyRACF:Debug] + Result XML + GroupAdmin.alter() + + + + + + Definition exists. Add command skipped due to precheck option + + 8 + 16 + 8 + ALTGROUP TESTGRP0 OMVS (GID (********)) + REDACTED MESSAGE CONCERNING GID, REVIEW DOCUMENTATION OF IKJ56702I FOR MORE INFORMATION + REDACTED MESSAGE CONCERNING GID, REVIEW DOCUMENTATION OF IKJ56701I FOR MORE INFORMATION + REDACTED MESSAGE CONCERNING GID, REVIEW DOCUMENTATION OF IKJ56701I FOR MORE INFORMATION + + + 4 + 0 + + + + [pyRACF:Debug] + Result Dictionary + GroupAdmin.alter() + + +{ + "securityResult": { + "group": { + "name": "testgrp0", + "operation": "set", + "requestId": "GroupRequest", + "info": [ + "Definition exists. Add command skipped due to precheck option" + ], + "commands": [ + { + "safReturnCode": 8, + "returnCode": 16, + "reasonCode": 8, + "image": "ALTGROUP TESTGRP0 OMVS (GID (********))", + "messages": [ + "REDACTED MESSAGE CONCERNING GID, REVIEW DOCUMENTATION OF IKJ56702I FOR MORE INFORMATION", + "REDACTED MESSAGE CONCERNING GID, REVIEW DOCUMENTATION OF IKJ56701I FOR MORE INFORMATION", + "REDACTED MESSAGE CONCERNING GID, REVIEW DOCUMENTATION OF IKJ56701I FOR MORE INFORMATION" + ] + } + ] + }, + "returnCode": 4, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + diff --git a/tests/common/common_log_samples/alter_group_additional_secret_added_success.log b/tests/common/common_log_samples/alter_group_additional_secret_added_success.log new file mode 100644 index 00000000..16ef1aa4 --- /dev/null +++ b/tests/common/common_log_samples/alter_group_additional_secret_added_success.log @@ -0,0 +1,238 @@ + + [pyRACF:Debug] + Request Dictionary + GroupAdmin.alter() + + +{} + + + [pyRACF:Debug] + Request XML + GroupAdmin.alter() + + + + + + + + [pyRACF:Debug] + Result XML + GroupAdmin.alter() + + + + + + + 0 + 0 + 0 + LISTGRP TESTGRP0 + INFORMATION FOR GROUP TESTGRP0 + SUPERIOR GROUP=SYS1 OWNER=ESWIFT CREATED=23.150 + NO INSTALLATION DATA + NO MODEL DATA SET + TERMUACC + NO SUBGROUPS + USER(S)= ACCESS= ACCESS COUNT= UNIVERSAL ACCESS= + ESWIFT USE 000000 NONE + CONNECT ATTRIBUTES=SPECIAL + REVOKE DATE=NONE RESUME DATE=NONE + LEONARD USE 000000 NONE + CONNECT ATTRIBUTES=OPERATIONS + REVOKE DATE=NONE RESUME DATE=NONE + + + 0 + 0 + + + + [pyRACF:Debug] + Result Dictionary + GroupAdmin.alter() + + +{ + "securityResult": { + "group": { + "name": "testgrp0", + "operation": "listdata", + "requestId": "GroupRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "LISTGRP TESTGRP0 ", + "messages": [ + "INFORMATION FOR GROUP TESTGRP0", + " SUPERIOR GROUP=SYS1 OWNER=ESWIFT CREATED=23.150", + " NO INSTALLATION DATA", + " NO MODEL DATA SET", + " TERMUACC", + " NO SUBGROUPS", + " USER(S)= ACCESS= ACCESS COUNT= UNIVERSAL ACCESS=", + " ESWIFT USE 000000 NONE", + " CONNECT ATTRIBUTES=SPECIAL", + " REVOKE DATE=NONE RESUME DATE=NONE", + " LEONARD USE 000000 NONE", + " CONNECT ATTRIBUTES=OPERATIONS", + " REVOKE DATE=NONE RESUME DATE=NONE" + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Result Dictionary (Formatted Profile) + GroupAdmin.alter() + + +{ + "securityResult": { + "group": { + "name": "testgrp0", + "operation": "listdata", + "requestId": "GroupRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "LISTGRP TESTGRP0 ", + "profiles": [ + { + "base": { + "name": "testgrp0", + "superiorGroup": "sys1", + "owner": "eswift", + "created": "5/30/2023", + "installationData": null, + "modelDataSet": null, + "terminalUniversalAccess": true, + "subgroups": [], + "users": [ + { + "userid": "eswift", + "access": "use", + "accessCount": 0, + "universalAccess": null, + "connectAttributes": [ + "special" + ], + "revokeDate": null, + "resumeDate": null + }, + { + "userid": "leonard", + "access": "use", + "accessCount": 0, + "universalAccess": null, + "connectAttributes": [ + "operations" + ], + "revokeDate": null, + "resumeDate": null + } + ] + } + } + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Request Dictionary + GroupAdmin.alter() + + +{ + "omvs": { + "omvs:gid": { + "value": "********", + "operation": null + } + } +} + + + [pyRACF:Debug] + Request XML + GroupAdmin.alter() + + + + + + ******** + + + + + + [pyRACF:Debug] + Result XML + GroupAdmin.alter() + + + + + + Definition exists. Add command skipped due to precheck option + + 0 + 0 + 0 + ALTGROUP TESTGRP0 OMVS (GID (********)) + + + 0 + 0 + + + + [pyRACF:Debug] + Result Dictionary + GroupAdmin.alter() + + +{ + "securityResult": { + "group": { + "name": "testgrp0", + "operation": "set", + "requestId": "GroupRequest", + "info": [ + "Definition exists. Add command skipped due to precheck option" + ], + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "ALTGROUP TESTGRP0 OMVS (GID (********))" + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + diff --git a/tests/common/common_log_samples/alter_resource_additional_secret_added_error.log b/tests/common/common_log_samples/alter_resource_additional_secret_added_error.log new file mode 100644 index 00000000..c371a5ea --- /dev/null +++ b/tests/common/common_log_samples/alter_resource_additional_secret_added_error.log @@ -0,0 +1,257 @@ + + [pyRACF:Debug] + Request Dictionary + ResourceAdmin.alter() + + +{} + + + [pyRACF:Debug] + Request XML + ResourceAdmin.alter() + + + + + + + + [pyRACF:Debug] + Result XML + ResourceAdmin.alter() + + + + + + + 0 + 0 + 0 + RLIST ELIJTEST (TESTING) + CLASS NAME + ----- ---- + ELIJTEST TESTING + + LEVEL OWNER UNIVERSAL ACCESS YOUR ACCESS WARNING + ----- -------- ---------------- ----------- ------- + 00 ESWIFT READ READ NO + + INSTALLATION DATA + ----------------- + NONE + + APPLICATION DATA + ---------------- + NONE + + AUDITING + -------- + SUCCESS(UPDATE),FAILURES(READ) + + NOTIFY + ------ + NO USER TO BE NOTIFIED + + + 0 + 0 + + + + [pyRACF:Debug] + Result Dictionary + ResourceAdmin.alter() + + +{ + "securityResult": { + "resource": { + "name": "TESTING", + "class": "ELIJTEST", + "operation": "listdata", + "requestId": "ResourceRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "RLIST ELIJTEST (TESTING) ", + "messages": [ + "CLASS NAME", + "----- ----", + "ELIJTEST TESTING", + " ", + "LEVEL OWNER UNIVERSAL ACCESS YOUR ACCESS WARNING", + "----- -------- ---------------- ----------- -------", + " 00 ESWIFT READ READ NO", + " ", + "INSTALLATION DATA", + "-----------------", + "NONE", + " ", + "APPLICATION DATA", + "----------------", + "NONE", + " ", + "AUDITING", + "--------", + "SUCCESS(UPDATE),FAILURES(READ)", + " ", + "NOTIFY", + "------", + "NO USER TO BE NOTIFIED" + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Result Dictionary (Formatted Profile) + ResourceAdmin.alter() + + +{ + "securityResult": { + "resource": { + "name": "TESTING", + "class": "ELIJTEST", + "operation": "listdata", + "requestId": "ResourceRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "RLIST ELIJTEST (TESTING) ", + "profiles": [ + { + "base": { + "class": "elijtest", + "name": "testing", + "level": 0, + "owner": "eswift", + "universalAccess": "read", + "yourAccess": "read", + "warning": null, + "installationData": null, + "applicationData": null, + "auditing": { + "success": "update", + "failures": "read" + }, + "notify": null, + "generic": false + } + } + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Request Dictionary + ResourceAdmin.alter() + + +{ + "base": { + "base:universal_access": { + "value": "********", + "operation": null + }, + "base:owner": { + "value": "eswift", + "operation": null + } + } +} + + + [pyRACF:Debug] + Request XML + ResourceAdmin.alter() + + + + + + ******** + eswift + + + + + + [pyRACF:Debug] + Result XML + ResourceAdmin.alter() + + + + + + Definition exists. Add command skipped due to precheck option + + 8 + 16 + 8 + RALTER ELIJTEST (TESTING) UACC (********) OWNER (eswift) + REDACTED MESSAGE CONCERNING UNIVERSAL ACCESS, REVIEW DOCUMENTATION OF IKJ56702I FOR MORE INFORMATION + REDACTED MESSAGE CONCERNING UNIVERSAL ACCESS, REVIEW DOCUMENTATION OF IKJ56701I FOR MORE INFORMATION + IKJ56701I MISSING ALTER, CONTROL, UPDATE, READ, EXECUTE, OR NONE + + + 4 + 0 + + + + [pyRACF:Debug] + Result Dictionary + ResourceAdmin.alter() + + +{ + "securityResult": { + "resource": { + "name": "TESTING", + "class": "ELIJTEST", + "operation": "set", + "requestId": "ResourceRequest", + "info": [ + "Definition exists. Add command skipped due to precheck option" + ], + "commands": [ + { + "safReturnCode": 8, + "returnCode": 16, + "reasonCode": 8, + "image": "RALTER ELIJTEST (TESTING) UACC (********) OWNER (eswift)", + "messages": [ + "REDACTED MESSAGE CONCERNING UNIVERSAL ACCESS, REVIEW DOCUMENTATION OF IKJ56702I FOR MORE INFORMATION", + "REDACTED MESSAGE CONCERNING UNIVERSAL ACCESS, REVIEW DOCUMENTATION OF IKJ56701I FOR MORE INFORMATION", + "IKJ56701I MISSING ALTER, CONTROL, UPDATE, READ, EXECUTE, OR NONE" + ] + } + ] + }, + "returnCode": 4, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + diff --git a/tests/common/common_log_samples/alter_resource_additional_secret_added_success.log b/tests/common/common_log_samples/alter_resource_additional_secret_added_success.log new file mode 100644 index 00000000..e86e04a5 --- /dev/null +++ b/tests/common/common_log_samples/alter_resource_additional_secret_added_success.log @@ -0,0 +1,253 @@ + + [pyRACF:Debug] + Request Dictionary + ResourceAdmin.alter() + + +{} + + + [pyRACF:Debug] + Request XML + ResourceAdmin.alter() + + + + + + + + [pyRACF:Debug] + Result XML + ResourceAdmin.alter() + + + + + + + 0 + 0 + 0 + RLIST ELIJTEST (TESTING) + CLASS NAME + ----- ---- + ELIJTEST TESTING + + LEVEL OWNER UNIVERSAL ACCESS YOUR ACCESS WARNING + ----- -------- ---------------- ----------- ------- + 00 ESWIFT READ READ NO + + INSTALLATION DATA + ----------------- + NONE + + APPLICATION DATA + ---------------- + NONE + + AUDITING + -------- + SUCCESS(UPDATE),FAILURES(READ) + + NOTIFY + ------ + NO USER TO BE NOTIFIED + + + 0 + 0 + + + + [pyRACF:Debug] + Result Dictionary + ResourceAdmin.alter() + + +{ + "securityResult": { + "resource": { + "name": "TESTING", + "class": "ELIJTEST", + "operation": "listdata", + "requestId": "ResourceRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "RLIST ELIJTEST (TESTING) ", + "messages": [ + "CLASS NAME", + "----- ----", + "ELIJTEST TESTING", + " ", + "LEVEL OWNER UNIVERSAL ACCESS YOUR ACCESS WARNING", + "----- -------- ---------------- ----------- -------", + " 00 ESWIFT READ READ NO", + " ", + "INSTALLATION DATA", + "-----------------", + "NONE", + " ", + "APPLICATION DATA", + "----------------", + "NONE", + " ", + "AUDITING", + "--------", + "SUCCESS(UPDATE),FAILURES(READ)", + " ", + "NOTIFY", + "------", + "NO USER TO BE NOTIFIED" + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Result Dictionary (Formatted Profile) + ResourceAdmin.alter() + + +{ + "securityResult": { + "resource": { + "name": "TESTING", + "class": "ELIJTEST", + "operation": "listdata", + "requestId": "ResourceRequest", + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "RLIST ELIJTEST (TESTING) ", + "profiles": [ + { + "base": { + "class": "elijtest", + "name": "testing", + "level": 0, + "owner": "eswift", + "universalAccess": "read", + "yourAccess": "read", + "warning": null, + "installationData": null, + "applicationData": null, + "auditing": { + "success": "update", + "failures": "read" + }, + "notify": null, + "generic": false + } + } + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + + + [pyRACF:Debug] + Request Dictionary + ResourceAdmin.alter() + + +{ + "base": { + "base:universal_access": { + "value": "Read", + "operation": null + }, + "base:owner": { + "value": "********", + "operation": null + } + } +} + + + [pyRACF:Debug] + Request XML + ResourceAdmin.alter() + + + + + + Read + ******** + + + + + + [pyRACF:Debug] + Result XML + ResourceAdmin.alter() + + + + + + Definition exists. Add command skipped due to precheck option + + 0 + 0 + 0 + RALTER ELIJTEST (TESTING) UACC (Read) OWNER (********) + ICH11009I RACLISTED PROFILES FOR ELIJTEST WILL NOT REFLECT THE UPDATE(S) UNTIL A SETROPTS REFRESH IS ISSUED. + + + 0 + 0 + + + + [pyRACF:Debug] + Result Dictionary + ResourceAdmin.alter() + + +{ + "securityResult": { + "resource": { + "name": "TESTING", + "class": "ELIJTEST", + "operation": "set", + "requestId": "ResourceRequest", + "info": [ + "Definition exists. Add command skipped due to precheck option" + ], + "commands": [ + { + "safReturnCode": 0, + "returnCode": 0, + "reasonCode": 0, + "image": "RALTER ELIJTEST (TESTING) UACC (Read) OWNER (********)", + "messages": [ + "ICH11009I RACLISTED PROFILES FOR ELIJTEST WILL NOT REFLECT THE UPDATE(S) UNTIL A SETROPTS REFRESH IS ISSUED." + ] + } + ] + }, + "returnCode": 0, + "reasonCode": 0, + "runningUserid": "testuser" + } +} + diff --git a/tests/common/common_result_samples/alter_group_result_error_gid_secret.json b/tests/common/common_result_samples/alter_group_result_error_gid_secret.json index d201e1d8..33de23bd 100644 --- a/tests/common/common_result_samples/alter_group_result_error_gid_secret.json +++ b/tests/common/common_result_samples/alter_group_result_error_gid_secret.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "set", "requestId": "GroupRequest", "info": [ diff --git a/tests/common/common_result_samples/alter_group_result_success_gid_secret.json b/tests/common/common_result_samples/alter_group_result_success_gid_secret.json index 40655569..98e53f28 100644 --- a/tests/common/common_result_samples/alter_group_result_success_gid_secret.json +++ b/tests/common/common_result_samples/alter_group_result_success_gid_secret.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "set", "requestId": "GroupRequest", "info": [ diff --git a/tests/common/test_additional_secrets_redaction.py b/tests/common/test_additional_secrets_redaction.py index b142bdc8..4faa1a27 100644 --- a/tests/common/test_additional_secrets_redaction.py +++ b/tests/common/test_additional_secrets_redaction.py @@ -30,6 +30,7 @@ class TestAdditionalSecretsResultRedaction(unittest.TestCase): maxDiff = None + ansi_escape = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])") # ============================================================================ # User Administration @@ -119,6 +120,61 @@ def test_user_admin_custom_secret_redacted_request(self): str(result), ) + @patch("pyracf.common.irrsmo00.IRRSMO00.call_racf") + def test_alter_user_request_debug_log_additional_secret_added_get_redacted_on_success( + self, + call_racf_mock: Mock, + ): + user_admin = UserAdmin(debug=True, additional_secret_traits=["omvs:uid"]) + call_racf_mock.side_effect = [ + TestUserConstants.TEST_EXTRACT_USER_RESULT_BASE_ONLY_SUCCESS_XML, + TestUserConstants.TEST_ALTER_USER_RESULT_EXTENDED_SUCCESS_XML, + ] + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + user_admin.alter( + "squidwrd", + traits=TestUserConstants.TEST_ALTER_USER_REQUEST_TRAITS_EXTENDED, + ) + success_log = self.ansi_escape.sub("", stdout.getvalue()) + self.assertEqual( + success_log, + TestCommonConstants.TEST_ALTER_USER_ADDITIONAL_SECRET_ADDED_SUCCESS_LOG, + ) + self.assertNotIn( + str(TestUserConstants.TEST_ALTER_USER_REQUEST_TRAITS_EXTENDED["omvs:uid"]), + success_log, + ) + + @patch("pyracf.common.irrsmo00.IRRSMO00.call_racf") + def test_alter_user_request_debug_log_additional_secret_added_get_redacted_on_error( + self, + call_racf_mock: Mock, + ): + user_admin = UserAdmin(debug=True, additional_secret_traits=["omvs:uid"]) + call_racf_mock.side_effect = [ + TestUserConstants.TEST_EXTRACT_USER_RESULT_BASE_ONLY_SUCCESS_XML, + TestUserConstants.TEST_ALTER_USER_RESULT_ERROR_XML, + ] + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + try: + user_admin.alter( + "squidwrd", + traits=TestUserConstants.TEST_ALTER_USER_REQUEST_TRAITS_UID_ERROR, + ) + except SecurityRequestError: + pass + error_log = self.ansi_escape.sub("", stdout.getvalue()) + self.assertEqual( + error_log, + TestCommonConstants.TEST_ALTER_USER_ADDITIONAL_SECRET_ADDED_ERROR_LOG, + ) + self.assertNotIn( + str(TestUserConstants.TEST_ALTER_USER_REQUEST_TRAITS_UID_ERROR["omvs:uid"]), + error_log, + ) + # ============================================================================ # Group Administration # ============================================================================ @@ -182,6 +238,61 @@ def test_group_admin_custom_secret_redacted_request(self): str(result), ) + @patch("pyracf.common.irrsmo00.IRRSMO00.call_racf") + def test_alter_group_request_debug_log_additional_secret_added_get_redacted_on_success( + self, + call_racf_mock: Mock, + ): + group_admin = GroupAdmin(debug=True, additional_secret_traits=["omvs:gid"]) + call_racf_mock.side_effect = [ + TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_XML, + TestGroupConstants.TEST_ALTER_GROUP_RESULT_SUCCESS_XML, + ] + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + group_admin.alter( + "testgrp0", + traits=TestGroupConstants.TEST_ALTER_GROUP_REQUEST_TRAITS, + ) + success_log = self.ansi_escape.sub("", stdout.getvalue()) + self.assertEqual( + success_log, + TestCommonConstants.TEST_ALTER_GROUP_ADDITIONAL_SECRET_ADDED_SUCCESS_LOG, + ) + self.assertNotIn( + str(TestGroupConstants.TEST_ALTER_GROUP_REQUEST_TRAITS["omvs:gid"]), + success_log, + ) + + @patch("pyracf.common.irrsmo00.IRRSMO00.call_racf") + def test_alter_group_request_debug_log_additional_secret_added_get_redacted_on_error( + self, + call_racf_mock: Mock, + ): + group_admin = GroupAdmin(debug=True, additional_secret_traits=["omvs:gid"]) + call_racf_mock.side_effect = [ + TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_XML, + TestGroupConstants.TEST_ALTER_GROUP_RESULT_ERROR_XML, + ] + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + try: + group_admin.alter( + "testgrp0", + traits=TestGroupConstants.TEST_ALTER_GROUP_REQUEST_ERROR_TRAITS, + ) + except SecurityRequestError: + pass + error_log = self.ansi_escape.sub("", stdout.getvalue()) + self.assertEqual( + error_log, + TestCommonConstants.TEST_ALTER_GROUP_ADDITIONAL_SECRET_ADDED_ERROR_LOG, + ) + self.assertNotIn( + str(TestGroupConstants.TEST_ALTER_GROUP_REQUEST_ERROR_TRAITS["omvs:gid"]), + error_log, + ) + # ============================================================================ # General Resource Profile Administration # ============================================================================ @@ -277,6 +388,62 @@ def test_resource_admin_custom_secret_redacted_request(self): str(result), ) + @patch("pyracf.common.irrsmo00.IRRSMO00.call_racf") + def test_alter_resource_request_debug_log_additional_secret_added_get_redacted_on_success( + self, + call_racf_mock: Mock, + ): + resource_admin = ResourceAdmin( + debug=True, additional_secret_traits=["base:owner"] + ) + call_racf_mock.side_effect = [ + TestResourceConstants.TEST_EXTRACT_RESOURCE_RESULT_BASE_SUCCESS_XML, + TestResourceConstants.TEST_ALTER_RESOURCE_RESULT_SUCCESS_XML, + ] + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + resource_admin.alter( + "TESTING", + "ELIJTEST", + traits=TestResourceConstants.TEST_ALTER_RESOURCE_REQUEST_TRAITS, + ) + success_log = self.ansi_escape.sub("", stdout.getvalue()) + self.assertEqual( + success_log, + TestCommonConstants.TEST_ALTER_RESOURCE_ADDITIONAL_SECRET_ADDED_SUCCESS_LOG, + ) + # No AssertNotInTest because Equal test to log is sufficient and value technically appears + + @patch("pyracf.common.irrsmo00.IRRSMO00.call_racf") + def test_alter_resource_request_debug_log_additional_secret_added_get_redacted_on_error( + self, + call_racf_mock: Mock, + ): + secret_trait = "base:universal_access" + resource_admin = ResourceAdmin( + debug=True, additional_secret_traits=[secret_trait] + ) + call_racf_mock.side_effect = [ + TestResourceConstants.TEST_EXTRACT_RESOURCE_RESULT_BASE_SUCCESS_XML, + TestResourceConstants.TEST_ALTER_RESOURCE_RESULT_ERROR_XML, + ] + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + try: + resource_admin.alter( + "TESTING", + "ELIJTEST", + traits=TestResourceConstants.TEST_ALTER_RESOURCE_REQUEST_ERROR_TRAITS, + ) + except SecurityRequestError: + pass + error_log = self.ansi_escape.sub("", stdout.getvalue()) + self.assertEqual( + error_log, + TestCommonConstants.TEST_ALTER_RESOURCE_ADDITIONAL_SECRET_ADDED_ERROR_LOG, + ) + # No AssertNotInTest because Equal test to log is sufficient and value technically appears + # ============================================================================ # Data Set Profile Administration # ============================================================================ @@ -341,6 +508,63 @@ def test_data_set_admin_custom_secret_redacted_request(self): str(result), ) + @patch("pyracf.common.irrsmo00.IRRSMO00.call_racf") + def test_alter_data_set_request_debug_log_additional_secret_added_get_redacted_on_success( + self, + call_racf_mock: Mock, + ): + data_set_admin = DataSetAdmin( + debug=True, additional_secret_traits=["base:owner"] + ) + call_racf_mock.side_effect = [ + TestDataSetConstants.TEST_EXTRACT_DATA_SET_RESULT_BASE_ONLY_SUCCESS_XML, + TestDataSetConstants.TEST_ALTER_DATA_SET_RESULT_SUCCESS_XML, + ] + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + data_set_admin.alter( + "ESWIFT.TEST.T1136242.P3020470", + traits=TestDataSetConstants.TEST_ALTER_DATA_SET_REQUEST_TRAITS, + ) + success_log = self.ansi_escape.sub("", stdout.getvalue()) + self.assertEqual( + success_log, + TestCommonConstants.TEST_ALTER_DATA_SET_ADDITIONAL_SECRET_ADDED_SUCCESS_LOG, + ) + # No AssertNotInTest because Equal test to log is sufficient and value technically appears + + @patch("pyracf.common.irrsmo00.IRRSMO00.call_racf") + def test_alter_data_set_request_debug_log_additional_secret_added_get_redacted_on_error( + self, + call_racf_mock: Mock, + ): + secret_trait = "base:universal_access" + data_set_admin = DataSetAdmin( + debug=True, additional_secret_traits=[secret_trait] + ) + call_racf_mock.side_effect = [ + TestDataSetConstants.TEST_EXTRACT_DATA_SET_RESULT_BASE_ONLY_SUCCESS_XML, + TestDataSetConstants.TEST_ALTER_DATA_SET_RESULT_ERROR_XML, + ] + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + try: + data_set_admin.alter( + "ESWIFT.TEST.T1136242.P3020470", + traits=TestDataSetConstants.TEST_ALTER_DATA_SET_REQUEST_ERROR_TRAITS, + ) + except SecurityRequestError: + pass + error_log = self.ansi_escape.sub("", stdout.getvalue()) + self.assertEqual( + error_log, + TestCommonConstants.TEST_ALTER_DATA_SET_ADDITIONAL_SECRET_ADDED_ERROR_LOG, + ) + # No AssertNotInTest because Equal test to log is sufficient and value technically appears + + # ============================================================================ + # Generic Testing for all Admin Types + # ============================================================================ def test_incompatible_admin_custom_secret_redaction_error(self): admin_types = [ (AccessAdmin, "permission"), @@ -382,68 +606,3 @@ def test_compatible_admin_incompatible_traits_custom_secret_redaction_error(self f"Cannot add specified additional secrets to '{profile_type}' object.\n" + incompatible_traits_text, ) - - -@patch("pyracf.common.irrsmo00.IRRSMO00.call_racf") -class TestAdditionalSecretsLoggingRedaction(unittest.TestCase): - maxDiff = None - user_admin = UserAdmin(debug=True) - ansi_escape = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])") - - # ============================================================================ - # Add Additional Secrets - # ============================================================================ - def test_alter_user_request_debug_log_additional_secret_added_get_redacted_on_success( - self, - call_racf_mock: Mock, - ): - user_admin = UserAdmin(debug=True, additional_secret_traits=["omvs:uid"]) - call_racf_mock.side_effect = [ - TestUserConstants.TEST_EXTRACT_USER_RESULT_BASE_ONLY_SUCCESS_XML, - TestUserConstants.TEST_ALTER_USER_RESULT_EXTENDED_SUCCESS_XML, - ] - stdout = io.StringIO() - with contextlib.redirect_stdout(stdout): - user_admin.alter( - "squidwrd", - traits=TestUserConstants.TEST_ALTER_USER_REQUEST_TRAITS_EXTENDED, - ) - success_log = self.ansi_escape.sub("", stdout.getvalue()) - self.assertEqual( - success_log, - TestCommonConstants.TEST_ALTER_USER_ADDITIONAL_SECRET_ADDED_SUCCESS_LOG, - ) - self.assertNotIn( - str(TestUserConstants.TEST_ALTER_USER_REQUEST_TRAITS_EXTENDED["omvs:uid"]), - success_log, - ) - - # Secret redacted from command image but not from resulting error message. - # Marked experimental until resolved - def test_alter_user_request_debug_log_additional_secret_added_get_redacted_on_error( - self, - call_racf_mock: Mock, - ): - user_admin = UserAdmin(debug=True, additional_secret_traits=["omvs:uid"]) - call_racf_mock.side_effect = [ - TestUserConstants.TEST_EXTRACT_USER_RESULT_BASE_ONLY_SUCCESS_XML, - TestUserConstants.TEST_ALTER_USER_RESULT_ERROR_XML, - ] - stdout = io.StringIO() - with contextlib.redirect_stdout(stdout): - try: - user_admin.alter( - "squidwrd", - traits=TestUserConstants.TEST_ALTER_USER_REQUEST_TRAITS_UID_ERROR, - ) - except SecurityRequestError: - pass - error_log = self.ansi_escape.sub("", stdout.getvalue()) - self.assertEqual( - error_log, - TestCommonConstants.TEST_ALTER_USER_ADDITIONAL_SECRET_ADDED_ERROR_LOG, - ) - self.assertNotIn( - str(TestUserConstants.TEST_ALTER_USER_REQUEST_TRAITS_UID_ERROR["omvs:uid"]), - error_log, - ) diff --git a/tests/common/test_common_constants.py b/tests/common/test_common_constants.py index c83f51a4..5ff149bc 100644 --- a/tests/common/test_common_constants.py +++ b/tests/common/test_common_constants.py @@ -110,6 +110,24 @@ def get_sample(sample_file: str) -> Union[str, bytes]: "omvs:default_shell": "/bin/sh", "base:installation_data": "Test = Value; Other(stuff goes here)'')", } +TEST_ALTER_USER_RESULT_SUCCESS_UID_SECRET_DICTIONARY = get_sample( + "alter_user_result_success_uid_secret.json" +) +TEST_ALTER_USER_RESULT_ERROR_UID_SECRET_DICTIONARY = get_sample( + "alter_user_result_error_uid_secret.json" +) +TEST_ALTER_USER_RESULT_INST_DATA_SUCCESS_XML = get_sample( + "alter_user_result_success_inst_data.xml" +) +TEST_ALTER_USER_RESULT_SUCCESS_INST_DATA_SECRET_DICTIONARY = get_sample( + "alter_user_result_success_inst_data_secret.json" +) +TEST_ALTER_USER_ADDITIONAL_SECRET_ADDED_SUCCESS_LOG = get_sample( + "alter_user_additional_secret_added_success.log" +) +TEST_ALTER_USER_ADDITIONAL_SECRET_ADDED_ERROR_LOG = get_sample( + "alter_user_additional_secret_added_error.log" +) TEST_ALTER_DATA_SET_RESULT_SUCCESS_OWNER_SECRET_DICTIONARY = get_sample( "alter_data_set_result_success_owner_secret.json" @@ -117,6 +135,12 @@ def get_sample(sample_file: str) -> Union[str, bytes]: TEST_ALTER_DATA_SET_RESULT_ERROR_UACC_SECRET_DICTIONARY = get_sample( "alter_data_set_result_error_uacc_secret.json" ) +TEST_ALTER_DATA_SET_ADDITIONAL_SECRET_ADDED_SUCCESS_LOG = get_sample( + "alter_data_set_additional_secret_added_success.log" +) +TEST_ALTER_DATA_SET_ADDITIONAL_SECRET_ADDED_ERROR_LOG = get_sample( + "alter_data_set_additional_secret_added_error.log" +) TEST_ALTER_GROUP_RESULT_SUCCESS_GID_SECRET_DICTIONARY = get_sample( "alter_group_result_success_gid_secret.json" @@ -124,6 +148,12 @@ def get_sample(sample_file: str) -> Union[str, bytes]: TEST_ALTER_GROUP_RESULT_ERROR_GID_SECRET_DICTIONARY = get_sample( "alter_group_result_error_gid_secret.json" ) +TEST_ALTER_GROUP_ADDITIONAL_SECRET_ADDED_SUCCESS_LOG = get_sample( + "alter_group_additional_secret_added_success.log" +) +TEST_ALTER_GROUP_ADDITIONAL_SECRET_ADDED_ERROR_LOG = get_sample( + "alter_group_additional_secret_added_error.log" +) TEST_ALTER_RESOURCE_OVERWRITE_AUDIT_RESULT_SUCCESS_XML = get_sample( "alter_resource_overwrite_audit_result_success.xml" @@ -137,25 +167,11 @@ def get_sample(sample_file: str) -> Union[str, bytes]: TEST_ALTER_RESOURCE_RESULT_ERROR_UACC_SECRET_DICTIONARY = get_sample( "alter_resource_result_error_uacc_secret.json" ) - -TEST_ALTER_USER_RESULT_SUCCESS_UID_SECRET_DICTIONARY = get_sample( - "alter_user_result_success_uid_secret.json" -) -TEST_ALTER_USER_RESULT_ERROR_UID_SECRET_DICTIONARY = get_sample( - "alter_user_result_error_uid_secret.json" -) -TEST_ALTER_USER_RESULT_INST_DATA_SUCCESS_XML = get_sample( - "alter_user_result_success_inst_data.xml" -) -TEST_ALTER_USER_RESULT_SUCCESS_INST_DATA_SECRET_DICTIONARY = get_sample( - "alter_user_result_success_inst_data_secret.json" -) - -TEST_ALTER_USER_ADDITIONAL_SECRET_ADDED_SUCCESS_LOG = get_sample( - "alter_user_additional_secret_added_success.log" +TEST_ALTER_RESOURCE_ADDITIONAL_SECRET_ADDED_SUCCESS_LOG = get_sample( + "alter_resource_additional_secret_added_success.log" ) -TEST_ALTER_USER_ADDITIONAL_SECRET_ADDED_ERROR_LOG = get_sample( - "alter_user_additional_secret_added_error.log" +TEST_ALTER_RESOURCE_ADDITIONAL_SECRET_ADDED_ERROR_LOG = get_sample( + "alter_resource_additional_secret_added_error.log" ) # ============================================================================ diff --git a/tests/connection/connection_log_samples/connect_connection_error.log b/tests/connection/connection_log_samples/connect_connection_error.log index 1563c4bc..74d05a20 100644 --- a/tests/connection/connection_log_samples/connect_connection_error.log +++ b/tests/connection/connection_log_samples/connect_connection_error.log @@ -24,7 +24,7 @@ - + @@ -38,7 +38,7 @@ - + 8 16 @@ -62,7 +62,7 @@ "securityResult": { "groupConnection": { "name": "ESWIFT", - "group": "TESTGRP0", + "group": "testgrp0", "operation": "set", "requestId": "ConnectionRequest", "commands": [ diff --git a/tests/connection/connection_log_samples/connect_connection_success.log b/tests/connection/connection_log_samples/connect_connection_success.log index c10b7e01..215b104a 100644 --- a/tests/connection/connection_log_samples/connect_connection_success.log +++ b/tests/connection/connection_log_samples/connect_connection_success.log @@ -24,7 +24,7 @@ - + @@ -38,7 +38,7 @@ - + 0 0 @@ -60,7 +60,7 @@ "securityResult": { "groupConnection": { "name": "ESWIFT", - "group": "TESTGRP0", + "group": "testgrp0", "operation": "set", "requestId": "ConnectionRequest", "commands": [ diff --git a/tests/connection/connection_request_samples/connect_connection_request.xml b/tests/connection/connection_request_samples/connect_connection_request.xml index f6c274d1..d7eda207 100644 --- a/tests/connection/connection_request_samples/connect_connection_request.xml +++ b/tests/connection/connection_request_samples/connect_connection_request.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/connection/connection_request_samples/connection_give_group_access_attribute.xml b/tests/connection/connection_request_samples/connection_give_group_access_attribute.xml index e5d15a33..f37d69c9 100644 --- a/tests/connection/connection_request_samples/connection_give_group_access_attribute.xml +++ b/tests/connection/connection_request_samples/connection_give_group_access_attribute.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/connection/connection_request_samples/connection_give_group_auditor_authority.xml b/tests/connection/connection_request_samples/connection_give_group_auditor_authority.xml index 8bb8b7af..9c0a48c0 100644 --- a/tests/connection/connection_request_samples/connection_give_group_auditor_authority.xml +++ b/tests/connection/connection_request_samples/connection_give_group_auditor_authority.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/connection/connection_request_samples/connection_give_group_operations_authority.xml b/tests/connection/connection_request_samples/connection_give_group_operations_authority.xml index cfaf13fa..b2b01bb5 100644 --- a/tests/connection/connection_request_samples/connection_give_group_operations_authority.xml +++ b/tests/connection/connection_request_samples/connection_give_group_operations_authority.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/connection/connection_request_samples/connection_give_group_special_authority.xml b/tests/connection/connection_request_samples/connection_give_group_special_authority.xml index b39b16c9..4b4d05eb 100644 --- a/tests/connection/connection_request_samples/connection_give_group_special_authority.xml +++ b/tests/connection/connection_request_samples/connection_give_group_special_authority.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/connection/connection_request_samples/connection_take_away_group_access_attribute.xml b/tests/connection/connection_request_samples/connection_take_away_group_access_attribute.xml index 622e3808..0af86fe9 100644 --- a/tests/connection/connection_request_samples/connection_take_away_group_access_attribute.xml +++ b/tests/connection/connection_request_samples/connection_take_away_group_access_attribute.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/connection/connection_request_samples/connection_take_away_group_auditor_authority.xml b/tests/connection/connection_request_samples/connection_take_away_group_auditor_authority.xml index a5d35c65..17cee5c5 100644 --- a/tests/connection/connection_request_samples/connection_take_away_group_auditor_authority.xml +++ b/tests/connection/connection_request_samples/connection_take_away_group_auditor_authority.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/connection/connection_request_samples/connection_take_away_group_operations_authority.xml b/tests/connection/connection_request_samples/connection_take_away_group_operations_authority.xml index de82369e..99380b80 100644 --- a/tests/connection/connection_request_samples/connection_take_away_group_operations_authority.xml +++ b/tests/connection/connection_request_samples/connection_take_away_group_operations_authority.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/connection/connection_request_samples/connection_take_away_group_special_authority.xml b/tests/connection/connection_request_samples/connection_take_away_group_special_authority.xml index 330c1e12..c7b3c7d9 100644 --- a/tests/connection/connection_request_samples/connection_take_away_group_special_authority.xml +++ b/tests/connection/connection_request_samples/connection_take_away_group_special_authority.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/connection/connection_request_samples/delete_connection_request.xml b/tests/connection/connection_request_samples/delete_connection_request.xml index 94e897e7..97ccba22 100644 --- a/tests/connection/connection_request_samples/delete_connection_request.xml +++ b/tests/connection/connection_request_samples/delete_connection_request.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/tests/connection/connection_result_samples/connect_connection_result_error.json b/tests/connection/connection_result_samples/connect_connection_result_error.json index fe180153..ada4d6f9 100644 --- a/tests/connection/connection_result_samples/connect_connection_result_error.json +++ b/tests/connection/connection_result_samples/connect_connection_result_error.json @@ -2,7 +2,7 @@ "securityResult": { "groupConnection": { "name": "ESWIFT", - "group": "TESTGRP0", + "group": "testgrp0", "operation": "set", "requestId": "ConnectionRequest", "commands": [ diff --git a/tests/connection/connection_result_samples/connect_connection_result_error.xml b/tests/connection/connection_result_samples/connect_connection_result_error.xml index 4c16be89..30f46941 100644 --- a/tests/connection/connection_result_samples/connect_connection_result_error.xml +++ b/tests/connection/connection_result_samples/connect_connection_result_error.xml @@ -1,6 +1,6 @@ - + 8 16 diff --git a/tests/connection/connection_result_samples/connect_connection_result_success.json b/tests/connection/connection_result_samples/connect_connection_result_success.json index 75d10ecc..62a670fc 100644 --- a/tests/connection/connection_result_samples/connect_connection_result_success.json +++ b/tests/connection/connection_result_samples/connect_connection_result_success.json @@ -2,7 +2,7 @@ "securityResult": { "groupConnection": { "name": "ESWIFT", - "group": "TESTGRP0", + "group": "testgrp0", "operation": "set", "requestId": "ConnectionRequest", "commands": [ diff --git a/tests/connection/connection_result_samples/connect_connection_result_success.xml b/tests/connection/connection_result_samples/connect_connection_result_success.xml index 82e960db..786d994a 100644 --- a/tests/connection/connection_result_samples/connect_connection_result_success.xml +++ b/tests/connection/connection_result_samples/connect_connection_result_success.xml @@ -1,6 +1,6 @@ - + 0 0 diff --git a/tests/connection/connection_result_samples/delete_connection_result_error.json b/tests/connection/connection_result_samples/delete_connection_result_error.json index 193ad0f6..6b938059 100644 --- a/tests/connection/connection_result_samples/delete_connection_result_error.json +++ b/tests/connection/connection_result_samples/delete_connection_result_error.json @@ -2,7 +2,7 @@ "securityResult": { "groupConnection": { "name": "ESWIFT", - "group": "TESTGRP0", + "group": "testgrp0", "operation": "del", "requestId": "ConnectionRequest", "commands": [ diff --git a/tests/connection/connection_result_samples/delete_connection_result_error.xml b/tests/connection/connection_result_samples/delete_connection_result_error.xml index f6ba65ef..fee101db 100644 --- a/tests/connection/connection_result_samples/delete_connection_result_error.xml +++ b/tests/connection/connection_result_samples/delete_connection_result_error.xml @@ -1,6 +1,6 @@ - + 8 16 diff --git a/tests/connection/connection_result_samples/delete_connection_result_success.json b/tests/connection/connection_result_samples/delete_connection_result_success.json index 0b4a3d20..f9f29a19 100644 --- a/tests/connection/connection_result_samples/delete_connection_result_success.json +++ b/tests/connection/connection_result_samples/delete_connection_result_success.json @@ -2,7 +2,7 @@ "securityResult": { "groupConnection": { "name": "ESWIFT", - "group": "TESTGRP0", + "group": "testgrp0", "operation": "del", "requestId": "ConnectionRequest", "commands": [ diff --git a/tests/connection/connection_result_samples/delete_connection_result_success.xml b/tests/connection/connection_result_samples/delete_connection_result_success.xml index 38174748..7b4eb078 100644 --- a/tests/connection/connection_result_samples/delete_connection_result_success.xml +++ b/tests/connection/connection_result_samples/delete_connection_result_success.xml @@ -1,6 +1,6 @@ - + 0 0 diff --git a/tests/connection/test_connection_debug_logging.py b/tests/connection/test_connection_debug_logging.py index ea9b80c1..fbfc0a33 100644 --- a/tests/connection/test_connection_debug_logging.py +++ b/tests/connection/test_connection_debug_logging.py @@ -35,7 +35,7 @@ def test_connect_connection_request_debug_log_works_on_success( with contextlib.redirect_stdout(stdout): self.connection_admin.connect( "ESWIFT", - "TESTGRP0", + "testgrp0", traits=TestConnectionConstants.TEST_CONNECT_CONNECTION_REQUEST_TRAITS, ), success_log = self.ansi_escape.sub("", stdout.getvalue()) @@ -55,7 +55,7 @@ def test_connect_connection_request_debug_log_works_on_error( try: self.connection_admin.connect( "ESWIFT", - "TESTGRP0", + "testgrp0", traits=TestConnectionConstants.TEST_CONNECT_CONNECTION_REQUEST_TRAITS, ), except SecurityRequestError: diff --git a/tests/connection/test_connection_request_builder.py b/tests/connection/test_connection_request_builder.py index 620bf1de..a80e2ba7 100644 --- a/tests/connection/test_connection_request_builder.py +++ b/tests/connection/test_connection_request_builder.py @@ -18,7 +18,7 @@ class TestConnectionRequestBuilder(unittest.TestCase): def test_connection_admin_build_connect_connection_request(self): result = self.connection_admin.connect( "ESWIFT", - "TESTGRP0", + "testgrp0", traits=TestConnectionConstants.TEST_CONNECT_CONNECTION_REQUEST_TRAITS, ) self.assertEqual( @@ -26,7 +26,7 @@ def test_connection_admin_build_connect_connection_request(self): ) def test_connection_admin_build_delete_connection_request(self): - result = self.connection_admin.delete("ESWIFT", "TESTGRP0") + result = self.connection_admin.delete("ESWIFT", "testgrp0") self.assertEqual( result, TestConnectionConstants.TEST_DELETE_CONNECTION_REQUEST_XML ) diff --git a/tests/connection/test_connection_result_parser.py b/tests/connection/test_connection_result_parser.py index 0df0e9f8..dd21d1b1 100644 --- a/tests/connection/test_connection_result_parser.py +++ b/tests/connection/test_connection_result_parser.py @@ -30,7 +30,7 @@ def test_connection_admin_can_parse_connect_connection_success_xml( self.assertEqual( self.connection_admin.connect( "ESWIFT", - "TESTGRP0", + "testgrp0", traits=TestConnectionConstants.TEST_CONNECT_CONNECTION_REQUEST_TRAITS, ), TestConnectionConstants.TEST_CONNECT_CONNECTION_RESULT_SUCCESS_DICTIONARY, @@ -47,7 +47,7 @@ def test_connection_admin_can_parse_connect_connection_error_xml( with self.assertRaises(SecurityRequestError) as exception: self.connection_admin.connect( "ESWIFT", - "TESTGRP0", + "testgrp0", traits=TestConnectionConstants.TEST_CONNECT_CONNECTION_REQUEST_TRAITS, ) self.assertEqual( @@ -66,7 +66,7 @@ def test_connection_admin_can_parse_delete_connection_success_xml( TestConnectionConstants.TEST_DELETE_CONNECTION_RESULT_SUCCESS_XML ) self.assertEqual( - self.connection_admin.delete("ESWIFT", "TESTGRP0"), + self.connection_admin.delete("ESWIFT", "testgrp0"), TestConnectionConstants.TEST_DELETE_CONNECTION_RESULT_SUCCESS_DICTIONARY, ) @@ -79,7 +79,7 @@ def test_connection_admin_can_parse_delete_connection_error_xml( TestConnectionConstants.TEST_DELETE_CONNECTION_RESULT_ERROR_XML ) with self.assertRaises(SecurityRequestError) as exception: - self.connection_admin.delete("ESWIFT", "TESTGRP0") + self.connection_admin.delete("ESWIFT", "testgrp0") self.assertEqual( exception.exception.result, TestConnectionConstants.TEST_DELETE_CONNECTION_RESULT_ERROR_DICTIONARY, diff --git a/tests/connection/test_connection_setters.py b/tests/connection/test_connection_setters.py index 37d91099..20e1327c 100644 --- a/tests/connection/test_connection_setters.py +++ b/tests/connection/test_connection_setters.py @@ -20,7 +20,7 @@ class TestConnectionSetters(unittest.TestCase): # ============================================================================ def test_connection_admin_build_give_group_special_request(self): result = self.connection_admin.give_group_special_authority( - "ESWIFT", "TESTGRP0" + "ESWIFT", "testgrp0" ) self.assertEqual( result, TestConnectionConstants.TEST_CONNECTION_GIVE_GROUP_SPECIAL_AUTHORITY @@ -28,7 +28,7 @@ def test_connection_admin_build_give_group_special_request(self): def test_connection_admin_build_take_away_group_special_authority_request(self): result = self.connection_admin.take_away_group_special_authority( - "ESWIFT", "TESTGRP0" + "ESWIFT", "testgrp0" ) self.assertEqual( result, @@ -40,7 +40,7 @@ def test_connection_admin_build_take_away_group_special_authority_request(self): # ============================================================================ def test_connection_admin_build_give_group_auditor_authority_request(self): result = self.connection_admin.give_group_auditor_authority( - "ESWIFT", "TESTGRP0" + "ESWIFT", "testgrp0" ) self.assertEqual( result, TestConnectionConstants.TEST_CONNECTION_GIVE_GROUP_AUDITOR_AUTHORITY @@ -48,7 +48,7 @@ def test_connection_admin_build_give_group_auditor_authority_request(self): def test_connection_admin_build_take_away_group_auditor_authority_request(self): result = self.connection_admin.take_away_group_auditor_authority( - "ESWIFT", "TESTGRP0" + "ESWIFT", "testgrp0" ) self.assertEqual( result, @@ -60,7 +60,7 @@ def test_connection_admin_build_take_away_group_auditor_authority_request(self): # ============================================================================ def test_connection_admin_build_give_group_operations_authority_request(self): result = self.connection_admin.give_group_operations_authority( - "ESWIFT", "TESTGRP0" + "ESWIFT", "testgrp0" ) self.assertEqual( result, @@ -69,7 +69,7 @@ def test_connection_admin_build_give_group_operations_authority_request(self): def test_connection_admin_build_take_away_group_operations_authority_request(self): result = self.connection_admin.take_away_group_operations_authority( - "ESWIFT", "TESTGRP0" + "ESWIFT", "testgrp0" ) self.assertEqual( result, @@ -80,14 +80,14 @@ def test_connection_admin_build_take_away_group_operations_authority_request(sel # Group Access Attribute # ============================================================================ def test_connection_admin_build_give_group_access_attribute_request(self): - result = self.connection_admin.give_group_access_attribute("ESWIFT", "TESTGRP0") + result = self.connection_admin.give_group_access_attribute("ESWIFT", "testgrp0") self.assertEqual( result, TestConnectionConstants.TEST_CONNECTION_SET_GROUP_ACCESS_ATTRIBUTE ) def test_connection_admin_build_take_away_group_access_attribute(self): result = self.connection_admin.take_away_group_access_attribute( - "ESWIFT", "TESTGRP0" + "ESWIFT", "testgrp0" ) self.assertEqual( result, diff --git a/tests/data_set/data_set_log_samples/alter_data_set_error.log b/tests/data_set/data_set_log_samples/alter_data_set_error.log index 90cd31b1..5371bdf1 100644 --- a/tests/data_set/data_set_log_samples/alter_data_set_error.log +++ b/tests/data_set/data_set_log_samples/alter_data_set_error.log @@ -173,7 +173,7 @@ { "base": { "base:universal_access": { - "value": "Read", + "value": "Alter", "operation": null }, "base:owner": { @@ -192,7 +192,7 @@ - Read + Alter eswift diff --git a/tests/data_set/test_data_set_constants.py b/tests/data_set/test_data_set_constants.py index cf050ab2..d9633d22 100644 --- a/tests/data_set/test_data_set_constants.py +++ b/tests/data_set/test_data_set_constants.py @@ -97,6 +97,10 @@ def get_sample(sample_file: str) -> Union[str, bytes]: "base:universal_access": "Read", "base:owner": "eswift", } +TEST_ALTER_DATA_SET_REQUEST_ERROR_TRAITS = { + "base:universal_access": "Alter", + "base:owner": "eswift", +} # Extract Data Set TEST_EXTRACT_DATA_SET_REQUEST_BASE_XML = get_sample("extract_data_set_request_base.xml") diff --git a/tests/data_set/test_data_set_debug_logging.py b/tests/data_set/test_data_set_debug_logging.py index 8edd78d0..08963ccc 100644 --- a/tests/data_set/test_data_set_debug_logging.py +++ b/tests/data_set/test_data_set_debug_logging.py @@ -56,7 +56,7 @@ def test_alter_data_set_request_debug_log_works_on_error( try: self.data_set_admin.alter( "ESWIFT.TEST.T1136242.P3020470", - traits=TestDataSetConstants.TEST_ALTER_DATA_SET_REQUEST_TRAITS, + traits=TestDataSetConstants.TEST_ALTER_DATA_SET_REQUEST_ERROR_TRAITS, ) except SecurityRequestError: pass diff --git a/tests/group/group_log_samples/alter_group_error.log b/tests/group/group_log_samples/alter_group_error.log index 34205d68..6299214b 100644 --- a/tests/group/group_log_samples/alter_group_error.log +++ b/tests/group/group_log_samples/alter_group_error.log @@ -13,7 +13,7 @@ - + @@ -24,7 +24,7 @@ - + 0 0 @@ -58,7 +58,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ @@ -100,7 +100,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ @@ -178,7 +178,7 @@ - + 3000000000 @@ -193,7 +193,7 @@ - + Definition exists. Add command skipped due to precheck option 8 @@ -218,7 +218,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "set", "requestId": "GroupRequest", "info": [ diff --git a/tests/group/group_log_samples/alter_group_success.log b/tests/group/group_log_samples/alter_group_success.log index 7bf5e943..79e35607 100644 --- a/tests/group/group_log_samples/alter_group_success.log +++ b/tests/group/group_log_samples/alter_group_success.log @@ -13,7 +13,7 @@ - + @@ -24,7 +24,7 @@ - + 0 0 @@ -58,7 +58,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ @@ -100,7 +100,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ @@ -178,7 +178,7 @@ - + 1234567 @@ -193,7 +193,7 @@ - + Definition exists. Add command skipped due to precheck option 0 @@ -215,7 +215,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "set", "requestId": "GroupRequest", "info": [ diff --git a/tests/group/group_log_samples/extract_group_base_omvs_error.log b/tests/group/group_log_samples/extract_group_base_omvs_error.log index cb969528..fe0e48ba 100644 --- a/tests/group/group_log_samples/extract_group_base_omvs_error.log +++ b/tests/group/group_log_samples/extract_group_base_omvs_error.log @@ -15,7 +15,7 @@ - + @@ -28,7 +28,7 @@ - + 8 16 @@ -50,7 +50,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ diff --git a/tests/group/group_log_samples/extract_group_base_omvs_success.log b/tests/group/group_log_samples/extract_group_base_omvs_success.log index fcf3adde..9ac440b1 100644 --- a/tests/group/group_log_samples/extract_group_base_omvs_success.log +++ b/tests/group/group_log_samples/extract_group_base_omvs_success.log @@ -15,7 +15,7 @@ - + @@ -28,7 +28,7 @@ - + 0 0 @@ -60,7 +60,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ @@ -100,7 +100,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ diff --git a/tests/group/group_request_samples/add_group_request.xml b/tests/group/group_request_samples/add_group_request.xml index e4967aea..0efb989f 100644 --- a/tests/group/group_request_samples/add_group_request.xml +++ b/tests/group/group_request_samples/add_group_request.xml @@ -1,5 +1,5 @@ - + 6667 diff --git a/tests/group/group_request_samples/alter_group_request.xml b/tests/group/group_request_samples/alter_group_request.xml index ee9ba6d6..d2e10601 100644 --- a/tests/group/group_request_samples/alter_group_request.xml +++ b/tests/group/group_request_samples/alter_group_request.xml @@ -1,5 +1,5 @@ - + 1234567 diff --git a/tests/group/group_request_samples/delete_group_request.xml b/tests/group/group_request_samples/delete_group_request.xml index f68558b0..007f9ddf 100644 --- a/tests/group/group_request_samples/delete_group_request.xml +++ b/tests/group/group_request_samples/delete_group_request.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/tests/group/group_request_samples/extract_group_request_base_omvs.xml b/tests/group/group_request_samples/extract_group_request_base_omvs.xml index 75fb3c6e..4538a757 100644 --- a/tests/group/group_request_samples/extract_group_request_base_omvs.xml +++ b/tests/group/group_request_samples/extract_group_request_base_omvs.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/group/group_request_samples/group_set_omvs_gid.xml b/tests/group/group_request_samples/group_set_omvs_gid.xml index ee9ba6d6..d2e10601 100644 --- a/tests/group/group_request_samples/group_set_omvs_gid.xml +++ b/tests/group/group_request_samples/group_set_omvs_gid.xml @@ -1,5 +1,5 @@ - + 1234567 diff --git a/tests/group/group_request_samples/group_set_ovm_gid.xml b/tests/group/group_request_samples/group_set_ovm_gid.xml index 5c9acb29..93220ef3 100644 --- a/tests/group/group_request_samples/group_set_ovm_gid.xml +++ b/tests/group/group_request_samples/group_set_ovm_gid.xml @@ -1,5 +1,5 @@ - + 1234567 diff --git a/tests/group/group_result_samples/add_group_result_success.json b/tests/group/group_result_samples/add_group_result_success.json index 1ae3e4bb..1a1fc5e3 100644 --- a/tests/group/group_result_samples/add_group_result_success.json +++ b/tests/group/group_result_samples/add_group_result_success.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "set", "requestId": "GroupRequest", "commands": [ diff --git a/tests/group/group_result_samples/add_group_result_success.xml b/tests/group/group_result_samples/add_group_result_success.xml index 98461f6f..6fa8b5c4 100644 --- a/tests/group/group_result_samples/add_group_result_success.xml +++ b/tests/group/group_result_samples/add_group_result_success.xml @@ -1,6 +1,6 @@ - + 0 0 diff --git a/tests/group/group_result_samples/alter_group_result_error.json b/tests/group/group_result_samples/alter_group_result_error.json index 77d89a27..4a1f7860 100644 --- a/tests/group/group_result_samples/alter_group_result_error.json +++ b/tests/group/group_result_samples/alter_group_result_error.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "set", "requestId": "GroupRequest", "info": [ diff --git a/tests/group/group_result_samples/alter_group_result_error.xml b/tests/group/group_result_samples/alter_group_result_error.xml index 4b0617fa..da49c5ef 100644 --- a/tests/group/group_result_samples/alter_group_result_error.xml +++ b/tests/group/group_result_samples/alter_group_result_error.xml @@ -1,6 +1,6 @@ - + Definition exists. Add command skipped due to precheck option 8 diff --git a/tests/group/group_result_samples/alter_group_result_success.json b/tests/group/group_result_samples/alter_group_result_success.json index 19a411f6..8bb226bd 100644 --- a/tests/group/group_result_samples/alter_group_result_success.json +++ b/tests/group/group_result_samples/alter_group_result_success.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "set", "requestId": "GroupRequest", "info": [ diff --git a/tests/group/group_result_samples/alter_group_result_success.xml b/tests/group/group_result_samples/alter_group_result_success.xml index 57a90029..dedb13bc 100644 --- a/tests/group/group_result_samples/alter_group_result_success.xml +++ b/tests/group/group_result_samples/alter_group_result_success.xml @@ -1,6 +1,6 @@ - + Definition exists. Add command skipped due to precheck option 0 diff --git a/tests/group/group_result_samples/delete_group_result_error.json b/tests/group/group_result_samples/delete_group_result_error.json index afefddae..04e2aa62 100644 --- a/tests/group/group_result_samples/delete_group_result_error.json +++ b/tests/group/group_result_samples/delete_group_result_error.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "del", "requestId": "GroupRequest", "commands": [ diff --git a/tests/group/group_result_samples/delete_group_result_error.xml b/tests/group/group_result_samples/delete_group_result_error.xml index 9691be79..5ee1e658 100644 --- a/tests/group/group_result_samples/delete_group_result_error.xml +++ b/tests/group/group_result_samples/delete_group_result_error.xml @@ -1,6 +1,6 @@ - + 8 16 diff --git a/tests/group/group_result_samples/delete_group_result_success.json b/tests/group/group_result_samples/delete_group_result_success.json index 13ff5a4e..757001b5 100644 --- a/tests/group/group_result_samples/delete_group_result_success.json +++ b/tests/group/group_result_samples/delete_group_result_success.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "del", "requestId": "GroupRequest", "commands": [ diff --git a/tests/group/group_result_samples/delete_group_result_success.xml b/tests/group/group_result_samples/delete_group_result_success.xml index d87ac6db..8bc5cd05 100644 --- a/tests/group/group_result_samples/delete_group_result_success.xml +++ b/tests/group/group_result_samples/delete_group_result_success.xml @@ -1,6 +1,6 @@ - + 0 0 diff --git a/tests/group/group_result_samples/extract_group_result_base_omvs_error.json b/tests/group/group_result_samples/extract_group_result_base_omvs_error.json index 745d18f8..336c87fe 100644 --- a/tests/group/group_result_samples/extract_group_result_base_omvs_error.json +++ b/tests/group/group_result_samples/extract_group_result_base_omvs_error.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ diff --git a/tests/group/group_result_samples/extract_group_result_base_omvs_error.xml b/tests/group/group_result_samples/extract_group_result_base_omvs_error.xml index 599b7d67..8a66dcfa 100644 --- a/tests/group/group_result_samples/extract_group_result_base_omvs_error.xml +++ b/tests/group/group_result_samples/extract_group_result_base_omvs_error.xml @@ -1,6 +1,6 @@ - + 8 16 diff --git a/tests/group/group_result_samples/extract_group_result_base_omvs_success.json b/tests/group/group_result_samples/extract_group_result_base_omvs_success.json index 2b57fad5..987a9093 100644 --- a/tests/group/group_result_samples/extract_group_result_base_omvs_success.json +++ b/tests/group/group_result_samples/extract_group_result_base_omvs_success.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ diff --git a/tests/group/group_result_samples/extract_group_result_base_omvs_success.xml b/tests/group/group_result_samples/extract_group_result_base_omvs_success.xml index 36855b23..081516a6 100644 --- a/tests/group/group_result_samples/extract_group_result_base_omvs_success.xml +++ b/tests/group/group_result_samples/extract_group_result_base_omvs_success.xml @@ -1,6 +1,6 @@ - + 0 0 diff --git a/tests/group/group_result_samples/extract_group_result_base_only_error.json b/tests/group/group_result_samples/extract_group_result_base_only_error.json index 0881b1fb..6826720f 100644 --- a/tests/group/group_result_samples/extract_group_result_base_only_error.json +++ b/tests/group/group_result_samples/extract_group_result_base_only_error.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ diff --git a/tests/group/group_result_samples/extract_group_result_base_only_error.xml b/tests/group/group_result_samples/extract_group_result_base_only_error.xml index 9cef8fac..83403145 100644 --- a/tests/group/group_result_samples/extract_group_result_base_only_error.xml +++ b/tests/group/group_result_samples/extract_group_result_base_only_error.xml @@ -1,6 +1,6 @@ - + 8 16 diff --git a/tests/group/group_result_samples/extract_group_result_base_only_success.json b/tests/group/group_result_samples/extract_group_result_base_only_success.json index 8ae9b377..e6476730 100644 --- a/tests/group/group_result_samples/extract_group_result_base_only_success.json +++ b/tests/group/group_result_samples/extract_group_result_base_only_success.json @@ -1,7 +1,7 @@ { "securityResult": { "group": { - "name": "TESTGRP0", + "name": "testgrp0", "operation": "listdata", "requestId": "GroupRequest", "commands": [ diff --git a/tests/group/group_result_samples/extract_group_result_base_only_success.xml b/tests/group/group_result_samples/extract_group_result_base_only_success.xml index 4986153a..904285fe 100644 --- a/tests/group/group_result_samples/extract_group_result_base_only_success.xml +++ b/tests/group/group_result_samples/extract_group_result_base_only_success.xml @@ -1,6 +1,6 @@ - + 0 0 diff --git a/tests/group/test_group_debug_logging.py b/tests/group/test_group_debug_logging.py index 0155cf63..ba54d187 100644 --- a/tests/group/test_group_debug_logging.py +++ b/tests/group/test_group_debug_logging.py @@ -35,7 +35,7 @@ def test_alter_group_request_debug_log_works_on_success( stdout = io.StringIO() with contextlib.redirect_stdout(stdout): self.group_admin.alter( - "TESTGRP0", traits=TestGroupConstants.TEST_ALTER_GROUP_REQUEST_TRAITS + "testgrp0", traits=TestGroupConstants.TEST_ALTER_GROUP_REQUEST_TRAITS ) success_log = self.ansi_escape.sub("", stdout.getvalue()) self.assertEqual(success_log, TestGroupConstants.TEST_ALTER_GROUP_SUCCESS_LOG) @@ -52,7 +52,7 @@ def test_alter_group_request_debug_log_works_on_error( with contextlib.redirect_stdout(stdout): try: self.group_admin.alter( - "TESTGRP0", + "testgrp0", traits=TestGroupConstants.TEST_ALTER_GROUP_REQUEST_ERROR_TRAITS, ) except SecurityRequestError: @@ -72,7 +72,7 @@ def test_extract_group_base_omvs_request_debug_log_works_on_success( ) stdout = io.StringIO() with contextlib.redirect_stdout(stdout): - self.group_admin.extract("TESTGRP0", segments=["omvs"]) + self.group_admin.extract("testgrp0", segments=["omvs"]) success_log = self.ansi_escape.sub("", stdout.getvalue()) self.assertEqual( success_log, TestGroupConstants.TEST_EXTRACT_GROUP_BASE_OMVS_SUCCESS_LOG @@ -88,7 +88,7 @@ def test_extract_group_base_omvs_request_debug_log_works_on_error( stdout = io.StringIO() with contextlib.redirect_stdout(stdout): try: - self.group_admin.extract("TESTGRP0", segments=["omvs"]) + self.group_admin.extract("testgrp0", segments=["omvs"]) except SecurityRequestError: pass error_log = self.ansi_escape.sub("", stdout.getvalue()) diff --git a/tests/group/test_group_getters.py b/tests/group/test_group_getters.py index e532c699..efb0861e 100644 --- a/tests/group/test_group_getters.py +++ b/tests/group/test_group_getters.py @@ -28,7 +28,7 @@ def test_group_admin_has_group_special_authority_returns_true_when_group_special TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_XML ) self.assertTrue( - self.group_admin.has_group_special_authority("TESTGRP0", "ESWIFT") + self.group_admin.has_group_special_authority("testgrp0", "ESWIFT") ) def test_group_admin_has_group_special_authority_returns_false_when_not_group_special( @@ -39,7 +39,7 @@ def test_group_admin_has_group_special_authority_returns_false_when_not_group_sp TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_SUCCESS_XML ) self.assertFalse( - self.group_admin.has_group_special_authority("TESTGRP0", "ESWIFT") + self.group_admin.has_group_special_authority("testgrp0", "ESWIFT") ) # Error in environment, TESTGRP0 already deleted/not added @@ -51,7 +51,7 @@ def test_group_admin_has_group_special_authority_raises_an_exception_when_extrac TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_ERROR_XML ) with self.assertRaises(SecurityRequestError): - self.group_admin.has_group_special_authority("TESTGRP0", "ESWIFT") + self.group_admin.has_group_special_authority("testgrp0", "ESWIFT") # ============================================================================ # Group Operations Authority @@ -64,7 +64,7 @@ def test_group_admin_has_group_operations_authority_returns_true_when_group_oper TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_XML ) self.assertTrue( - self.group_admin.has_group_operations_authority("TESTGRP0", "LEONARD") + self.group_admin.has_group_operations_authority("testgrp0", "LEONARD") ) def test_group_admin_has_group_operations_authority_returns_false_when_not_group_operations( @@ -75,7 +75,7 @@ def test_group_admin_has_group_operations_authority_returns_false_when_not_group TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_SUCCESS_XML ) self.assertFalse( - self.group_admin.has_group_operations_authority("TESTGRP0", "LEONARD") + self.group_admin.has_group_operations_authority("testgrp0", "LEONARD") ) # Error in environment, TESTGRP0 already deleted/not added @@ -87,7 +87,7 @@ def test_group_admin_has_group_operations_authority_raises_an_exception_when_ext TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_ERROR_XML ) with self.assertRaises(SecurityRequestError): - self.group_admin.has_group_operations_authority("TESTGRP0", "LEONARD") + self.group_admin.has_group_operations_authority("testgrp0", "LEONARD") # ============================================================================ # Group Auditor Authority @@ -105,7 +105,7 @@ def test_group_admin_has_group_auditor_authority_returns_true_when_group_auditor ) call_racf_mock.return_value = group_extract_auditor self.assertTrue( - self.group_admin.has_group_auditor_authority("TESTGRP0", "ESWIFT") + self.group_admin.has_group_auditor_authority("testgrp0", "ESWIFT") ) def test_group_admin_has_group_auditor_authority_returns_false_when_not_group_auditor( @@ -116,7 +116,7 @@ def test_group_admin_has_group_auditor_authority_returns_false_when_not_group_au TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_XML ) self.assertFalse( - self.group_admin.has_group_auditor_authority("TESTGRP0", "ESWIFT") + self.group_admin.has_group_auditor_authority("testgrp0", "ESWIFT") ) # Error in environment, TESTGRP0 already deleted/not added @@ -128,7 +128,7 @@ def test_group_admin_has_group_auditor_authority_raises_an_exception_when_extrac TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_ERROR_XML ) with self.assertRaises(SecurityRequestError): - self.group_admin.has_group_auditor_authority("TESTGRP0", "ESWIFT") + self.group_admin.has_group_auditor_authority("testgrp0", "ESWIFT") # ============================================================================ # Group Access Attribute @@ -146,7 +146,7 @@ def test_group_admin_has_group_access_attribute_returns_true_when_grpacc( ) call_racf_mock.return_value = group_extract_grpacc self.assertTrue( - self.group_admin.has_group_access_attribute("TESTGRP0", "LEONARD") + self.group_admin.has_group_access_attribute("testgrp0", "LEONARD") ) def test_group_admin_has_group_access_attribute_returns_false_when_not_grpacc( @@ -157,7 +157,7 @@ def test_group_admin_has_group_access_attribute_returns_false_when_not_grpacc( TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_XML ) self.assertFalse( - self.group_admin.has_group_access_attribute("TESTGRP0", "LEONARD") + self.group_admin.has_group_access_attribute("testgrp0", "LEONARD") ) # Error in environment, TESTGRP0 already deleted/not added @@ -169,7 +169,7 @@ def test_group_admin_has_group_access_attribute_raises_an_exception_when_extract TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_ERROR_XML ) with self.assertRaises(SecurityRequestError): - self.group_admin.has_group_access_attribute("TESTGRP0", "LEONARD") + self.group_admin.has_group_access_attribute("testgrp0", "LEONARD") # ============================================================================ # OMVS GID @@ -181,7 +181,7 @@ def test_group_admin_get_omvs_gid_works( call_racf_mock.return_value = ( TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_SUCCESS_XML ) - self.assertEqual(self.group_admin.get_omvs_gid("TESTGRP0"), 1234567) + self.assertEqual(self.group_admin.get_omvs_gid("testgrp0"), 1234567) # Error in environment, SQUIDWRD already deleted/not added def test_group_admin_get_omvs_gid_raises_an_exception_when_extract_fails( @@ -192,7 +192,7 @@ def test_group_admin_get_omvs_gid_raises_an_exception_when_extract_fails( TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_ERROR_XML ) with self.assertRaises(SecurityRequestError): - self.group_admin.get_omvs_gid("TESTGRP0"), 1234567 + self.group_admin.get_omvs_gid("testgrp0"), 1234567 def test_group_admin_get_omvs_gid_returns_none_when_no_omvs_segment_exists( self, @@ -201,7 +201,7 @@ def test_group_admin_get_omvs_gid_returns_none_when_no_omvs_segment_exists( call_racf_mock.return_value = ( TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_XML ) - self.assertIsNone(self.group_admin.get_omvs_gid("TESTGRP0")) + self.assertIsNone(self.group_admin.get_omvs_gid("testgrp0")) # ============================================================================ # OVM GID @@ -217,7 +217,7 @@ def test_group_admin_get_ovm_gid_works( "OMVS INFORMATION", "OVM INFORMATION" ) call_racf_mock.return_value = group_extract_ovm_gid - self.assertEqual(self.group_admin.get_ovm_gid("TESTGRP0"), 1234567) + self.assertEqual(self.group_admin.get_ovm_gid("testgrp0"), 1234567) # Error in environment, SQUIDWRD already deleted/not added def test_group_admin_get_ovm_gid_raises_an_exception_when_extract_fails( @@ -228,7 +228,7 @@ def test_group_admin_get_ovm_gid_raises_an_exception_when_extract_fails( TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_ERROR_XML ) with self.assertRaises(SecurityRequestError): - self.group_admin.get_ovm_gid("TESTGRP0"), 1234567 + self.group_admin.get_ovm_gid("testgrp0"), 1234567 def test_group_admin_get_ovm_gid_returns_none_when_no_ovm_segment_exists( self, @@ -237,4 +237,4 @@ def test_group_admin_get_ovm_gid_returns_none_when_no_ovm_segment_exists( call_racf_mock.return_value = ( TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_XML ) - self.assertIsNone(self.group_admin.get_ovm_gid("TESTGRP0")) + self.assertIsNone(self.group_admin.get_ovm_gid("testgrp0")) diff --git a/tests/group/test_group_request_builder.py b/tests/group/test_group_request_builder.py index ee9ee4c7..69c997c1 100644 --- a/tests/group/test_group_request_builder.py +++ b/tests/group/test_group_request_builder.py @@ -17,22 +17,22 @@ class TestGroupRequestBuilder(unittest.TestCase): def test_group_admin_build_add_group_request(self): result = self.group_admin.add( - "TESTGRP0", traits=TestGroupConstants.TEST_ADD_GROUP_REQUEST_TRAITS + "testgrp0", traits=TestGroupConstants.TEST_ADD_GROUP_REQUEST_TRAITS ) self.assertEqual(result, TestGroupConstants.TEST_ADD_GROUP_REQUEST_XML) def test_group_admin_build_alter_group_request(self): result = self.group_admin.alter( - "TESTGRP0", traits=TestGroupConstants.TEST_ALTER_GROUP_REQUEST_TRAITS + "testgrp0", traits=TestGroupConstants.TEST_ALTER_GROUP_REQUEST_TRAITS ) self.assertEqual(result, TestGroupConstants.TEST_ALTER_GROUP_REQUEST_XML) def test_group_admin_build_extract_group_request_base_omvs(self): - result = self.group_admin.extract("TESTGRP0", segments=["omvs"]) + result = self.group_admin.extract("testgrp0", segments=["omvs"]) self.assertEqual( result, TestGroupConstants.TEST_EXTRACT_GROUP_REQUEST_BASE_OMVS_XML ) def test_group_admin_build_delete_group_request(self): - result = self.group_admin.delete("TESTGRP0") + result = self.group_admin.delete("testgrp0") self.assertEqual(result, TestGroupConstants.TEST_DELETE_GROUP_REQUEST_XML) diff --git a/tests/group/test_group_result_parser.py b/tests/group/test_group_result_parser.py index 139e549a..d0105201 100644 --- a/tests/group/test_group_result_parser.py +++ b/tests/group/test_group_result_parser.py @@ -37,7 +37,7 @@ def test_group_admin_can_parse_add_group_success_xml( ] self.assertEqual( self.group_admin.add( - "TESTGRP0", traits=TestGroupConstants.TEST_ADD_GROUP_REQUEST_TRAITS + "testgrp0", traits=TestGroupConstants.TEST_ADD_GROUP_REQUEST_TRAITS ), TestGroupConstants.TEST_ADD_GROUP_RESULT_SUCCESS_DICTIONARY, ) @@ -46,7 +46,7 @@ def test_group_admin_throws_error_on_add_existing_group( self, call_racf_mock: Mock, ): - group_name = "TESTGRP0" + group_name = "testgrp0" call_racf_mock.side_effect = [ TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_XML, TestGroupConstants.TEST_ADD_GROUP_RESULT_SUCCESS_XML, @@ -66,7 +66,7 @@ def test_group_admin_add_surfaces_error_from_preliminary_extract( self, call_racf_mock: Mock, ): - group_name = "TESTGRP0" + group_name = "testgrp0" extract_group_error_xml = ( TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_ERROR_XML ) @@ -124,7 +124,7 @@ def test_group_admin_can_parse_alter_group_success_xml( ] self.assertEqual( self.group_admin.alter( - "TESTGRP0", traits=TestGroupConstants.TEST_ALTER_GROUP_REQUEST_TRAITS + "testgrp0", traits=TestGroupConstants.TEST_ALTER_GROUP_REQUEST_TRAITS ), TestGroupConstants.TEST_ALTER_GROUP_RESULT_SUCCESS_DICTIONARY, ) @@ -133,7 +133,7 @@ def test_group_admin_throws_error_on_alter_new_group( self, call_racf_mock: Mock, ): - group_name = "TESTGRP0" + group_name = "testgrp0" call_racf_mock.side_effect = [ TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_ERROR_XML, TestGroupConstants.TEST_ALTER_GROUP_RESULT_SUCCESS_XML, @@ -160,7 +160,7 @@ def test_group_admin_can_parse_alter_group_error_xml( ] with self.assertRaises(SecurityRequestError) as exception: self.group_admin.alter( - "TESTGRP0", + "testgrp0", traits=TestGroupConstants.TEST_ALTER_GROUP_REQUEST_ERROR_TRAITS, ) self.assertEqual( @@ -179,7 +179,7 @@ def test_group_admin_can_parse_extract_group_base_omvs_success_xml( TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_SUCCESS_XML ) self.assertEqual( - self.group_admin.extract("TESTGRP0", segments=["omvs"]), + self.group_admin.extract("testgrp0", segments=["omvs"]), TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_SUCCESS_DICTIONARY, ) @@ -191,7 +191,7 @@ def test_group_admin_can_parse_extract_group_base_only_success_xml( TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_XML ) self.assertEqual( - self.group_admin.extract("TESTGRP0"), + self.group_admin.extract("testgrp0"), TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_ONLY_SUCCESS_JSON, ) @@ -204,7 +204,7 @@ def test_group_admin_can_parse_extract_group_base_omvs_error_xml( TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_ERROR_XML ) with self.assertRaises(SecurityRequestError) as exception: - self.group_admin.extract("TESTGRP0", segments=["omvs"]) + self.group_admin.extract("testgrp0", segments=["omvs"]) self.assertEqual( exception.exception.result, TestGroupConstants.TEST_EXTRACT_GROUP_RESULT_BASE_OMVS_ERROR_DICTIONARY, @@ -221,7 +221,7 @@ def test_group_admin_can_parse_delete_group_success_xml( TestGroupConstants.TEST_DELETE_GROUP_RESULT_SUCCESS_XML ) self.assertEqual( - self.group_admin.delete("TESTGRP0"), + self.group_admin.delete("testgrp0"), TestGroupConstants.TEST_DELETE_GROUP_RESULT_SUCCESS_DICTIONARY, ) @@ -234,7 +234,7 @@ def test_group_admin_can_parse_delete_group_error_xml( TestGroupConstants.TEST_DELETE_GROUP_RESULT_ERROR_XML ) with self.assertRaises(SecurityRequestError) as exception: - self.group_admin.delete("TESTGRP0") + self.group_admin.delete("testgrp0") self.assertEqual( exception.exception.result, TestGroupConstants.TEST_DELETE_GROUP_RESULT_ERROR_DICTIONARY, diff --git a/tests/group/test_group_setters.py b/tests/group/test_group_setters.py index 209e64e6..db793c39 100644 --- a/tests/group/test_group_setters.py +++ b/tests/group/test_group_setters.py @@ -16,9 +16,9 @@ class TestGroupSetters(unittest.TestCase): group_admin = GroupAdmin(generate_requests_only=True) def test_group_admin_build_set_ovm_gid_request(self): - result = self.group_admin.set_ovm_gid("TESTGRP0", "1234567") + result = self.group_admin.set_ovm_gid("testgrp0", "1234567") self.assertEqual(result, TestGroupConstants.TEST_GROUP_SET_OVM_GID_XML) def test_group_admin_build_set_omvs_gid_request(self): - result = self.group_admin.set_omvs_gid("TESTGRP0", "1234567") + result = self.group_admin.set_omvs_gid("testgrp0", "1234567") self.assertEqual(result, TestGroupConstants.TEST_GROUP_SET_OMVS_GID_XML) diff --git a/tests/test_runner.py b/tests/test_runner.py index 4dcf5e3b..136675f0 100644 --- a/tests/test_runner.py +++ b/tests/test_runner.py @@ -11,7 +11,6 @@ from tests.access.test_access_request_builder import TestAccessRequestBuilder from tests.access.test_access_result_parser import TestAccessResultParser from tests.common.test_additional_secrets_redaction import ( - TestAdditionalSecretsLoggingRedaction, TestAdditionalSecretsResultRedaction, ) from tests.common.test_class_attributes import TestClassAttributes @@ -74,7 +73,6 @@ def __test_suite() -> unittest.TestSuite: TestAccessRequestBuilder, TestAccessDebugLogging, TestAdditionalSecretsResultRedaction, - TestAdditionalSecretsLoggingRedaction, TestClassAttributes, TestCustomizeSegmentTraits, TestSetupPrecheck,