Address issue for deprecated syntax
Change from :FOR to FOR/END to address a new WARNING in
the new robot version.
Sample warning message as mention below.
FOR loop starting on line 26: For loop header
':FOR' is deprecated. Use 'FOR' instead.
Change-Id: I3860386614d8418f10291977654976929f534b69
Signed-off-by: Sushil Singh <susilsi7@in.ibm.com>
diff --git a/redfish/managers/test_bmc_network_conf.robot b/redfish/managers/test_bmc_network_conf.robot
index 3d82259..eedbaec 100644
--- a/redfish/managers/test_bmc_network_conf.robot
+++ b/redfish/managers/test_bmc_network_conf.robot
@@ -59,22 +59,25 @@
[Documentation] Get IP Address And Verify.
[Tags] Get_IP_Address_And_Verify
- : FOR ${network_configuration} IN @{network_configurations}
- \ Verify IP On BMC ${network_configuration['Address']}
+ FOR ${network_configuration} IN @{network_configurations}
+ Verify IP On BMC ${network_configuration['Address']}
+ END
Get Netmask And Verify
[Documentation] Get Netmask And Verify.
[Tags] Get_Netmask_And_Verify
- : FOR ${network_configuration} IN @{network_configurations}
- \ Verify Netmask On BMC ${network_configuration['SubnetMask']}
+ FOR ${network_configuration} IN @{network_configurations}
+ Verify Netmask On BMC ${network_configuration['SubnetMask']}
+ END
Get Gateway And Verify
[Documentation] Get gateway and verify it's existence on the BMC.
[Tags] Get_Gateway_And_Verify
- : FOR ${network_configuration} IN @{network_configurations}
- \ Verify Gateway On BMC ${network_configuration['Gateway']}
+ FOR ${network_configuration} IN @{network_configurations}
+ Verify Gateway On BMC ${network_configuration['Gateway']}
+ END
Get MAC Address And Verify
[Documentation] Get MAC address and verify it's existence on the BMC.
@@ -91,9 +94,10 @@
[Documentation] Verify all configured IP and netmask on BMC.
[Tags] Verify_All_Configured_IP_And_Netmask
- : FOR ${network_configuration} IN @{network_configurations}
- \ Verify IP And Netmask On BMC ${network_configuration['Address']}
- ... ${network_configuration['SubnetMask']}
+ FOR ${network_configuration} IN @{network_configurations}
+ Verify IP And Netmask On BMC ${network_configuration['Address']}
+ ... ${network_configuration['SubnetMask']}
+ END
Get Hostname And Verify
[Documentation] Get hostname via Redfish and verify.
diff --git a/redfish/service_root/test_service_root_security.robot b/redfish/service_root/test_service_root_security.robot
index 311a368..59adfa3 100644
--- a/redfish/service_root/test_service_root_security.robot
+++ b/redfish/service_root/test_service_root_security.robot
@@ -188,5 +188,6 @@
FFDC On Test Case Fail
- :FOR ${item} IN @{session_list}
- \ Redfish.Delete ${item}
+ FOR ${item} IN @{session_list}
+ Redfish.Delete ${item}
+ END
diff --git a/redfish/update_service/test_firmware_inventory.robot b/redfish/update_service/test_firmware_inventory.robot
index 9794453..aef0b91 100644
--- a/redfish/update_service/test_firmware_inventory.robot
+++ b/redfish/update_service/test_firmware_inventory.robot
@@ -64,17 +64,18 @@
# {'@odata.id': '/redfish/v1/UpdateService/FirmwareInventory/a7c79f71'}
# {'@odata.id': '/redfish/v1/UpdateService/FirmwareInventory/ace821ef'}
- :FOR ${entry} IN RANGE 0 ${resp.dict["Members@odata.count"]}
- \ ${resp_resource}= Redfish.Get ${resp.dict["Members"][${entry}]["@odata.id"]}
+ FOR ${entry} IN RANGE 0 ${resp.dict["Members@odata.count"]}
+ ${resp_resource}= Redfish.Get ${resp.dict["Members"][${entry}]["@odata.id"]}
# Example:
# "Status": {
# "Health": "OK",
# "HealthRollup": "OK",
# "State": "Enabled"
# },
- \ Should Be Equal As Strings ${resp_resource.dict["Status"]["Health"]} OK
- \ Should Be Equal As Strings ${resp_resource.dict["Status"]["HealthRollup"]} OK
- \ Should Be Equal As Strings ${resp_resource.dict["Status"]["State"]} Enabled
+ Should Be Equal As Strings ${resp_resource.dict["Status"]["Health"]} OK
+ Should Be Equal As Strings ${resp_resource.dict["Status"]["HealthRollup"]} OK
+ Should Be Equal As Strings ${resp_resource.dict["Status"]["State"]} Enabled
+ END
Verify BMC Version Matches With FirmwareInventory
@@ -95,15 +96,14 @@
# {'@odata.id': '/redfish/v1/UpdateService/FirmwareInventory/ace821ef'}
${actual_count}= Evaluate ${resp.dict["Members@odata.count"]}-1
- :FOR ${entry} IN RANGE 0 ${resp.dict["Members@odata.count"]}
- \ ${resp_resource}= Redfish.Get ${resp.dict["Members"][${entry}]["@odata.id"]}
+ FOR ${entry} IN RANGE 0 ${resp.dict["Members@odata.count"]}
+ ${resp_resource}= Redfish.Get ${resp.dict["Members"][${entry}]["@odata.id"]}
# 3rd comparison of BMC version and verify FirmwareInventory bmc version.
# Example:
# "Version": 2.7.0-dev-19-g9b44ea7
- \ Exit For Loop If '${resp_resource.dict["Version"]}' == '${manager_bmc_version.strip('"')}'
- \ Run Keyword If '${entry}' == '${actual_count}' Fail
- ... BMC version not there in Firmware Inventory
-
+ Exit For Loop If '${resp_resource.dict["Version"]}' == '${manager_bmc_version.strip('"')}'
+ Run Keyword If '${entry}' == '${actual_count}' Fail BMC version not there in Firmware Inventory
+ END
Verify UpdateService Supports TransferProtocol TFTP
[Documentation] Verify update service supported values have TFTP protocol.