Redfish Network robot codes with latest directives
Changes:
- Run KeyWord If is deprecated since Robot
Framework version 5.*, use 'IF' instead
Tested:
- Checked using robot dry-run to make sure the
syntax is not broken
Change-Id: Ibe1bbbd4603c0e8348fa0408132e41a165ae0154
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/redfish/managers/test_bmc_network_conf.robot b/redfish/managers/test_bmc_network_conf.robot
index ec4854f..8f1ccce 100644
--- a/redfish/managers/test_bmc_network_conf.robot
+++ b/redfish/managers/test_bmc_network_conf.robot
@@ -721,8 +721,7 @@
# Description of argument(s):
# ip IP address to be deleted.
- Run Keyword If '${TEST STATUS}' == 'FAIL'
- ... Delete IP Address ${ip}
+ IF '${TEST STATUS}' == 'FAIL' Delete IP Address ${ip}
Test Teardown Execution
@@ -753,11 +752,10 @@
${DHCPEnabled}= Get IPv4 DHCP Enabled Status ${CHANNEL_NUMBER}
Set Suite Variable ${DHCPEnabled}
- ${ip_addr} ${gateway} ${subnetmask}= Run Keyword If ${DHCPEnabled}==True
- ... Get DHCP IP Info
-
- Run Keyword If ${DHCPEnabled}==True
- ... Add IP Address ${ip_addr} ${subnetmask} ${gateway}
+ IF ${DHCPEnabled}==True
+ ${ip_addr} ${gateway} ${subnetmask}= Get DHCP IP Info
+ Add IP Address ${ip_addr} ${subnetmask} ${gateway}
+ END
${test_gateway}= Get BMC Default Gateway
Set Suite Variable ${test_gateway}
@@ -770,8 +768,7 @@
# - Restore the DHCP IPv4 to enabled state
Redfish.Login
- Run Keyword If ${DHCPEnabled}==True
- ... Enable IPv4 DHCP Settings
+ IF ${DHCPEnabled}==True Enable IPv4 DHCP Settings
Configure Multiple Static IPv4 Addresses
@@ -813,10 +810,11 @@
${active_channel_config}= Get Active Channel Config
${ethernet_interface}= Set Variable ${active_channel_config['${CHANNEL_NUMBER}']['name']}
- Run Keyword If '${host_state}' == 'on'
- ... Redfish Power On stack_mode=skip
- ... ELSE
- ... Redfish Power off stack_mode=skip
+ IF '${host_state}' == 'on'
+ Redfish Power On stack_mode=skip
+ ELSE
+ Redfish Power off stack_mode=skip
+ END
Redfish.Get ${REDFISH_NW_ETH_IFACE}${ethernet_interface}
Ping Host ${OPENBMC_HOST}
@@ -836,8 +834,9 @@
... ${False}
IF ${ip_found} BREAK
END
- Run Keyword If '${ip_found}' == '${False}'
- ... Fail msg=Configured IP address not found on EthernetInterface URI.
+ IF '${ip_found}' == '${False}'
+ Fail msg=Configured IP address not found on EthernetInterface URI.
+ END
Enable IPv4 DHCP Settings