Update robot codes with latest directives
Changes:
- Non local variable is not uppercase
- The assignment sign is not consistent within the file.
Expected = but instead of blank spaces
- 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: I08a142a18a9066abdd6494bcddc167122564fd17
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/network/test_bmc_dhcp_conf.robot b/network/test_bmc_dhcp_conf.robot
index 808dded..7f38f53 100644
--- a/network/test_bmc_dhcp_conf.robot
+++ b/network/test_bmc_dhcp_conf.robot
@@ -8,27 +8,27 @@
Suite Setup Suite Setup Execution
Suite Teardown Run Keywords Restore Configuration AND Redfish.Logout
-Test Tags BMC_DHCP_Conf
+Test Tags BMC_DHCP_Conf
*** Variables ***
-&{dhcp_enable_dict} DHCPEnabled=${True}
-&{dhcp_disable_dict} DHCPEnabled=${False}
+&{DHCP_ENABLE_DICT} DHCPEnabled=${True}
+&{DHCP_DISABLE_DICT} DHCPEnabled=${False}
-&{dns_enable_dict} UseDNSServers=${True}
-&{dns_disable_dict} UseDNSServers=${False}
+&{DNS_ENABLE_DICT} UseDNSServers=${True}
+&{DNS_DISABLE_DICT} UseDNSServers=${False}
-&{ntp_enable_dict} UseNTPServers=${True}
-&{ntp_disable_dict} UseNTPServers=${False}
+&{NTP_ENABLE_DICT} UseNTPServers=${True}
+&{NTP_DISABLE_DICT} UseNTPServers=${False}
-&{domain_name_enable_dict} UseDomainName=${True}
-&{domain_name_disable_dict} UseDomainName=${False}
+&{DOMAIN_NAME_ENABLE_DICT} UseDomainName=${True}
+&{DOMAIN_NAME_DISABLE_DICT} UseDomainName=${False}
-&{enable_multiple_properties} UseDomainName=${True}
+&{ENABLE_MULTIPLE_PROPRETIES} UseDomainName=${True}
... UseNTPServers=${True}
... UseDNSServers=${True}
-&{disable_multiple_properties} UseDomainName=${False}
+&{DISABLE_MULTIPLE_PROPERTIES} UseDomainName=${False}
... UseNTPServers=${False}
... UseDNSServers=${False}
@@ -39,18 +39,17 @@
[Tags] Set_Network_Property_via_Redfish_And_Verify
[Template] Apply Ethernet Config
- # property
- ${dhcp_enable_dict}
- ${dhcp_disable_dict}
- ${dns_enable_dict}
- ${dns_disable_dict}
- ${domain_name_enable_dict}
- ${domain_name_disable_dict}
- ${ntp_enable_dict}
- ${ntp_disable_dict}
- ${enable_multiple_properties}
- ${disable_multiple_properties}
-
+ # property
+ ${DHCP_ENABLE_DICT}
+ ${DHCP_DISABLE_DICT}
+ ${DNS_ENABLE_DICT}
+ $NTP_ENABLE_DICT{DNS_DISABLE_DICT}
+ ${DOMAIN_NAME_ENABLE_DICT}
+ ${DOMAIN_NAME_DISABLE_DICT}
+ ${NTP_ENABLE_DICT}
+ ${NTP_DISABLE_DICT}
+ ${ENABLE_MULTIPLE_PROPRETIES}
+ ${DISABLE_MULTIPLE_PROPERTIES}
*** Keywords ***
@@ -61,20 +60,24 @@
Ping Host ${OPENBMC_HOST_ETH1}
Redfish.Login
- ${network_configurations}= Get Network Configuration Using Channel Number ${2}
+ ${network_configurations}=
+ ... Get Network Configuration Using Channel Number ${2}
FOR ${network_configuration} IN @{network_configurations}
- Run Keyword If '${network_configuration['Address']}' == '${OPENBMC_HOST_ETH1}'
- ... Run Keywords Set Suite Variable ${eth1_subnet_mask} ${network_configuration['SubnetMask']}
- ... AND Set Suite Variable ${eth1_gateway} ${network_configuration['Gateway']}
- ... AND Exit For Loop
+ IF '${network_configuration['Address']}' == '${OPENBMC_HOST_ETH1}'
+ Set Suite Variable ${eth1_subnet_mask} ${network_configuration['SubnetMask']}
+ Set Suite Variable ${eth1_gateway} ${network_configuration['Gateway']}
+ BREAK
+ END
END
- ${network_configurations}= Get Network Configuration Using Channel Number ${1}
+ ${network_configurations}=
+ ... Get Network Configuration Using Channel Number ${1}
FOR ${network_configuration} IN @{network_configurations}
- Run Keyword If '${network_configuration['Address']}' == '${OPENBMC_HOST}'
- ... Run Keywords Set Suite Variable ${eth0_subnet_mask} ${network_configuration['SubnetMask']}
- ... AND Set Suite Variable ${eth0_gateway} ${network_configuration['Gateway']}
- ... AND Exit For Loop
+ IF '${network_configuration['Address']}' == '${OPENBMC_HOST}'
+ Set Suite Variable ${eth0_subnet_mask} ${network_configuration['SubnetMask']}
+ Set Suite Variable ${eth0_gateway} ${network_configuration['Gateway']}
+ BREAK
+ END
END
Get Network Configuration Using Channel Number
@@ -82,13 +85,16 @@
[Arguments] ${channel_number}
# Description of argument(s):
- # channel_number Ethernet channel number, 1 is for eth0 and 2 is for eth1 (e.g. "1").
+ # channel_number Ethernet channel number, 1 is for eth0 and 2 is for
+ # eth1 (e.g. "1").
${active_channel_config}= Get Active Channel Config
- ${ethernet_interface}= Set Variable ${active_channel_config['${channel_number}']['name']}
+ ${ethernet_interface}=
+ ... Set Variable ${active_channel_config['${channel_number}']['name']}
${resp}= Redfish.Get ${REDFISH_NW_ETH_IFACE}${ethernet_interface}
- @{network_configurations}= Get From Dictionary ${resp.dict} IPv4StaticAddresses
+ @{network_configurations}=
+ ... Get From Dictionary ${resp.dict} IPv4StaticAddresses
RETURN @{network_configurations}
Apply Ethernet Config
@@ -110,8 +116,12 @@
Restore Configuration
[Documentation] Restore the configuration to Both Static Network
- Run Keyword If '${CHANNEL_NUMBER}' == '1' Add IP Address ${OPENBMC_HOST} ${eth0_subnet_mask} ${eth0_gateway}
- ... ELSE IF '${CHANNEL_NUMBER}' == '2' Add IP Address ${OPENBMC_HOST_ETH1} ${eth1_subnet_mask} ${eth1_gateway}
+ IF '${CHANNEL_NUMBER}' == '1'
+ Add IP Address ${OPENBMC_HOST} ${eth0_subnet_mask} ${eth0_gateway}
+ ELSE IF '${CHANNEL_NUMBER}' == '2'
+ Add IP Address
+ ... ${OPENBMC_HOST_ETH1} ${eth1_subnet_mask} ${eth1_gateway}
+ END
Verify Ethernet Config Property
[Documentation] verify ethernet config properties.
@@ -133,8 +143,8 @@
# UseNTPServers :True
# UseDNSServers :True
- ${key_map}= Get Dictionary Items ${property}
- FOR ${key} ${value} IN @{key_map}
- Should Be Equal As Strings ${response_data['${key}']} ${value}
- END
+ ${key_map}= Get Dictionary Items ${property}
+ FOR ${key} ${value} IN @{key_map}
+ Should Be Equal As Strings ${response_data['${key}']} ${value}
+ END