Robot coding guideline fixes
Changes:
- Fix line char 110 exceeding.
Change-Id: Ic5d49b867ace46724abe72ae3629369952606733
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/lib/dmtf_tools_utils.robot b/lib/dmtf_tools_utils.robot
index 419dc45..5b175ff 100644
--- a/lib/dmtf_tools_utils.robot
+++ b/lib/dmtf_tools_utils.robot
@@ -20,7 +20,9 @@
# rsv_dir_path Directory path for rsv tool (e.g. "Redfish-Service-Validator").
# rsv_github_url Github URL link(e.g "https://github.com/DMTF/Redfish-Service-Validator").
- ${rc} ${output}= Shell Cmd rm -rf ${rsv_dir_path} ; git clone --branch ${stable_branch} ${rsv_github_url} ${rsv_dir_path}
+ ${cmd_buf} Catenate rm -rf ${rsv_dir_path} ;
+ ... git clone --branch ${stable_branch} ${rsv_github_url} ${rsv_dir_path}
+ ${rc} ${output}= Shell Cmd ${cmd_buf}
Run DMTF Tool
diff --git a/redfish/account_service/test_ldap_configuration.robot b/redfish/account_service/test_ldap_configuration.robot
index eac05e7..3c07926 100644
--- a/redfish/account_service/test_ldap_configuration.robot
+++ b/redfish/account_service/test_ldap_configuration.robot
@@ -87,8 +87,10 @@
[Documentation] Verify that invalid AuthenticationType is not updated.
[Tags] Verify_LDAP_Update_With_Incorrect_AuthenticationType
+ ${body}= Catenate {'${ldap_type}': {'Authentication': {'AuthenticationType':'KerberosKeytab'}}}
+ ... valid_status_codes=[400]
Redfish.Patch ${REDFISH_BASE_URI}AccountService
- ... body={'${ldap_type}': {'Authentication': {'AuthenticationType':'KerberosKeytab'}}} valid_status_codes=[400]
+ ... body=${body}
Verify LDAP Login With Correct LDAP URL
@@ -481,8 +483,18 @@
# ldap_bind_dn_password The LDAP bind distinguished name password.
# ldap_base_dn The LDAP base distinguished name.
- Redfish.Patch ${REDFISH_BASE_URI}AccountService
- ... body={'${ldap_type}': {'ServiceEnabled': ${True}, 'ServiceAddresses': ['${ldap_server_uri}'], 'Authentication': {'AuthenticationType':'UsernameAndPassword', 'Username':'${ldap_bind_dn}', 'Password':'${ldap_bind_dn_password}'}, 'LDAPService': {'SearchSettings': {'BaseDistinguishedNames': ['${ldap_base_dn}']}}}}
+ ${body}= Catenate {'${ldap_type}':
+ ... {'ServiceEnabled': ${True},
+ ... 'ServiceAddresses': ['${ldap_server_uri}'],
+ ... 'Authentication':
+ ... {'AuthenticationType': 'UsernameAndPassword',
+ ... 'Username':'${ldap_bind_dn}',
+ ... 'Password': '${ldap_bind_dn_password}'},
+ ... 'LDAPService':
+ ... {'SearchSettings':
+ ... {'BaseDistinguishedNames': ['${ldap_base_dn}']}}}}
+
+ Redfish.Patch ${REDFISH_BASE_URI}AccountService body=${body}
Sleep 15s
diff --git a/redfish/managers/test_certificate.robot b/redfish/managers/test_certificate.robot
index 8a767e4..9254a17 100644
--- a/redfish/managers/test_certificate.robot
+++ b/redfish/managers/test_certificate.robot
@@ -319,8 +319,8 @@
BMC Execute Command rm ${certificate_file_path}
BMC Execute Command systemctl restart ${certificate_service}
BMC Execute Command systemctl daemon-reload
- Wait Until Keyword Succeeds 1 min 10 sec
- ... Redfish.Get ${certificate_uri}/1 valid_status_codes=[${HTTP_NOT_FOUND}, ${HTTP_INTERNAL_SERVER_ERROR}]
+ Wait Until Keyword Succeeds 1 min 10 sec Redfish.Get ${certificate_uri}/1
+ ... valid_status_codes=[${HTTP_NOT_FOUND}, ${HTTP_INTERNAL_SERVER_ERROR}]
Suite Setup Execution