Fix: Making changes to the LDAP Bucket
Changes:
Address HTTP Return Keyword
Tested:
Ran and Tested on BMC Environment.
Change-Id: I423c45ca85af2120f483d24e5c10f3d7e68985b7
Signed-off-by: Sweta Potthuri <spotthur@in.ibm.com>
diff --git a/redfish/account_service/test_ldap_configuration.robot b/redfish/account_service/test_ldap_configuration.robot
index 2a95bc2..b7fa6c1 100644
--- a/redfish/account_service/test_ldap_configuration.robot
+++ b/redfish/account_service/test_ldap_configuration.robot
@@ -451,7 +451,7 @@
${LDAP_TYPE} Operator ${GROUP_NAME} ${HTTP_OK}
# Verify LDAP user with Administrator privilege able to do host poweroff.
- ${LDAP_TYPE} Administrator ${GROUP_NAME} ${HTTP_OK}
+ ${LDAP_TYPE} Administrator ${GROUP_NAME} [${HTTP_OK},${HTTP_NO_CONTENT}]
Update LDAP User Roles And Verify Host Poweron Operation
@@ -469,7 +469,7 @@
${LDAP_TYPE} Operator ${GROUP_NAME} ${HTTP_OK}
# Verify LDAP user with Administrator privilege able to do host poweron.
- ${LDAP_TYPE} Administrator ${GROUP_NAME} ${HTTP_OK}
+ ${LDAP_TYPE} Administrator ${GROUP_NAME} [${HTTP_OK},${HTTP_NO_CONTENT}]
Configure IP Address Via Different User Roles And Verify
@@ -479,7 +479,7 @@
[Template] Update LDAP User Role And Configure IP Address
# Verify LDAP user with Administrator privilege is able to configure IP address.
- ${LDAP_TYPE} Administrator ${GROUP_NAME} ${HTTP_OK}
+ ${LDAP_TYPE} Administrator ${GROUP_NAME} [${HTTP_OK},${HTTP_NO_CONTENT}]
# Verify LDAP user with ReadOnly privilege is forbidden to configure IP address.
${LDAP_TYPE} ReadOnly ${GROUP_NAME} ${HTTP_FORBIDDEN}
@@ -495,7 +495,7 @@
[Template] Update LDAP User Role And Delete IP Address
# Verify LDAP user with Administrator privilege is able to delete IP address.
- ${LDAP_TYPE} Administrator ${GROUP_NAME} ${HTTP_OK}
+ ${LDAP_TYPE} Administrator ${GROUP_NAME} [${HTTP_OK},${HTTP_NO_CONTENT}]
# Verify LDAP user with ReadOnly privilege is forbidden to delete IP address.
${LDAP_TYPE} ReadOnly ${GROUP_NAME} ${HTTP_FORBIDDEN}
@@ -774,7 +774,7 @@
Update LDAP User Role And Host Poweroff
[Documentation] Update LDAP user role and do host poweroff.
- [Arguments] ${ldap_type} ${group_privilege} ${group_name} ${valid_status_code}
+ [Arguments] ${ldap_type} ${group_privilege} ${group_name} ${valid_status_code}=[${HTTP_OK,${HTTP_NO_CONTENT}]
[Teardown] Run Keywords Redfish.Logout AND Redfish.Login
# Description of argument(s):
@@ -792,7 +792,7 @@
Redfish.Login ${LDAP_USER} ${LDAP_USER_PASSWORD}
Redfish.Post ${REDFISH_POWER_URI}
- ... body={'ResetType': 'ForceOff'} valid_status_codes=[${valid_status_code}]
+ ... body={'ResetType': 'ForceOff'} valid_status_codes=${valid_status_code}
IF ${valid_status_code} == ${HTTP_FORBIDDEN} RETURN
Wait Until Keyword Succeeds 1 min 10 sec Verify Host Power State Off
@@ -800,7 +800,7 @@
Update LDAP User Role And Host Poweron
[Documentation] Update LDAP user role and do host poweron.
- [Arguments] ${ldap_type} ${group_privilege} ${group_name} ${valid_status_code}
+ [Arguments] ${ldap_type} ${group_privilege} ${group_name} ${valid_status_code}=[${HTTP_OK,${HTTP_NO_CONTENT}]
[Teardown] Run Keywords Redfish.Logout AND Redfish.Login
# Description of argument(s):
@@ -818,7 +818,7 @@
Redfish.Login ${LDAP_USER} ${LDAP_USER_PASSWORD}
Redfish.Post ${REDFISH_POWER_URI}
- ... body={'ResetType': 'On'} valid_status_codes=[${valid_status_code}]
+ ... body={'ResetType': 'On'} valid_status_codes=${valid_status_code}
IF ${valid_status_code} == ${HTTP_FORBIDDEN} RETURN
Verify Host Is Up
@@ -826,7 +826,7 @@
Update LDAP User Role And Configure IP Address
[Documentation] Update LDAP user role and configure IP address.
- [Arguments] ${ldap_type} ${group_privilege} ${group_name} ${valid_status_code}=${HTTP_OK}
+ [Arguments] ${ldap_type} ${group_privilege} ${group_name} ${valid_status_code}=[${HTTP_OK,${HTTP_NO_CONTENT}]
[Teardown] Run Keywords Redfish.Logout AND Redfish.Login AND Delete IP Address ${test_ip}
# Description of argument(s):
@@ -849,7 +849,7 @@
Update LDAP User Role And Delete IP Address
[Documentation] Update LDAP user role and delete IP address.
- [Arguments] ${ldap_type} ${group_privilege} ${group_name} ${valid_status_code}=${HTTP_OK}
+ [Arguments] ${ldap_type} ${group_privilege} ${group_name} ${valid_status_code}=[${HTTP_OK,${HTTP_NO_CONTENT}]
[Teardown] Run Keywords Redfish.Logout AND Redfish.Login AND Delete IP Address ${test_ip}
# Description of argument(s):