Rename XYZ_NETWORK_MANAGER variable to NETWORK_MANAGER in test code
Resolves openbmc/openbmc-test-automation#1234
Change-Id: Ib02caa48d16046f514acbf32e99f717ea09ccf0d
Signed-off-by: manasarm <manashsarma@in.ibm.com>
diff --git a/data/variables.py b/data/variables.py
index beb2629..5d7f08e 100644
--- a/data/variables.py
+++ b/data/variables.py
@@ -15,7 +15,7 @@
SETTINGS_URI = '/org/openbmc/settings/'
WATCHDOG_URI = OPENBMC_BASE_URI + 'watchdog/'
TIME_MANAGER_URI = OPENBMC_BASE_URI + 'time/'
-XYZ_NETWORK_MANAGER = OPENBMC_BASE_URI + 'network/'
+NETWORK_MANAGER = OPENBMC_BASE_URI + 'network/'
# Sensors base variables.
SENSORS_URI = OPENBMC_BASE_URI + 'sensors/'
diff --git a/extended/test_host_network.robot b/extended/test_host_network.robot
index 7de46be..4d46033 100644
--- a/extended/test_host_network.robot
+++ b/extended/test_host_network.robot
@@ -43,13 +43,13 @@
Run IPMI command ${ipmi_raw_cmd}
- ${data}= Read Properties ${XYZ_NETWORK_MANAGER}host0/intf/addr
+ ${data}= Read Properties ${NETWORK_MANAGER}host0/intf/addr
Should Contain ${data["Origin"]} Static
Should Be Equal ${data["Address"]} ${ip_address}
Should Be Equal ${data["Gateway"]} ${gateway_ip}
${new_mac_address}=
- ... Read Attribute ${XYZ_NETWORK_MANAGER}host0/intf MACAddress
+ ... Read Attribute ${NETWORK_MANAGER}host0/intf MACAddress
Should Be Equal ${new_mac_address} ${mac_address}
@@ -65,9 +65,9 @@
... ${SET_ADDR_PREFIX}${SPACE}${mac_address_hex}${SPACE}${DHCP}
Run IPMI command ${ipmi_raw_cmd}
- ${origin}= Read Attribute ${XYZ_NETWORK_MANAGER}host0/intf/addr Origin
+ ${origin}= Read Attribute ${NETWORK_MANAGER}host0/intf/addr Origin
${new_mac_address}=
- ... Read Attribute ${XYZ_NETWORK_MANAGER}host0/intf MACAddress
+ ... Read Attribute ${NETWORK_MANAGER}host0/intf MACAddress
Should Contain ${origin} DHCP
Should Be Equal ${new_mac_address} ${mac_address}
diff --git a/extended/test_mac.robot b/extended/test_mac.robot
index 47058a5..6e3966a 100644
--- a/extended/test_mac.robot
+++ b/extended/test_mac.robot
@@ -121,7 +121,7 @@
Open Connection And Login
# Get BMC MAC address.
- ${macaddr}= Read Attribute ${XYZ_NETWORK_MANAGER}/eth0 MACAddress
+ ${macaddr}= Read Attribute ${NETWORK_MANAGER}/eth0 MACAddress
Validate MAC On BMC ${macaddr}
Set Suite Variable ${macaddr}
@@ -148,7 +148,7 @@
${data}= Create Dictionary data=${mac_addr}
Run Keyword And Ignore Error OpenBMC Put Request
- ... ${XYZ_NETWORK_MANAGER}/eth0/attr/MACAddress data=${data}
+ ... ${NETWORK_MANAGER}/eth0/attr/MACAddress data=${data}
# After any modification on network interface, BMC restarts network
# module, wait until it is reachable.
diff --git a/extended/test_network.robot b/extended/test_network.robot
index f0c151e..237ae3b 100644
--- a/extended/test_network.robot
+++ b/extended/test_network.robot
@@ -69,7 +69,7 @@
Verify MAC Address
[Documentation] Get MAC address and verify.
[Tags] Verify_MAC_Address
- ${macaddr}= Read Attribute ${XYZ_NETWORK_MANAGER}/eth0 MACAddress
+ ${macaddr}= Read Attribute ${NETWORK_MANAGER}/eth0 MACAddress
Validate MAC On BMC ${macaddr}
Add New Valid IP And Verify
@@ -377,7 +377,7 @@
[Documentation] Verify default gateway.
[Tags] Verify that the default gateway has a valid route.
- ${default_gw}= Read Attribute ${XYZ_NETWORK_MANAGER}/config
+ ${default_gw}= Read Attribute ${NETWORK_MANAGER}/config
... DefaultGateway
Validate Route On BMC ${default_gw}
@@ -386,7 +386,7 @@
... hostname configured on system.
[Tags] Verify_Hostname
- ${hostname}= Read Attribute ${XYZ_NETWORK_MANAGER}/config HostName
+ ${hostname}= Read Attribute ${NETWORK_MANAGER}/config HostName
Validate Hostname On BMC ${hostname}
*** Keywords ***
@@ -411,7 +411,7 @@
# "/xyz/openbmc_project/network/eth0/ipv4/31f4ce8b"
# ],
- @{ipv4_uri_list}= Read Properties ${XYZ_NETWORK_MANAGER}/eth0/ipv4/
+ @{ipv4_uri_list}= Read Properties ${NETWORK_MANAGER}/eth0/ipv4/
Should Not Be Empty ${ipv4_uri_list} msg=IPv4 URI list is empty.
[Return] @{ipv4_uri_list}
@@ -501,7 +501,7 @@
${data}= Create Dictionary data=@{ip_parm_list}
Run Keyword And Ignore Error OpenBMC Post Request
- ... ${XYZ_NETWORK_MANAGER}/eth0/action/IP data=${data}
+ ... ${NETWORK_MANAGER}/eth0/action/IP data=${data}
# After any modification on network interface, BMC restarts network
# module, wait until it is reachable.
diff --git a/mnfg/test_factory_reset.robot b/mnfg/test_factory_reset.robot
index 969e5fe..5718933 100644
--- a/mnfg/test_factory_reset.robot
+++ b/mnfg/test_factory_reset.robot
@@ -71,7 +71,7 @@
${data}= Create Dictionary data=@{EMPTY}
Run Keyword And Ignore Error OpenBMC Post Request
- ... ${XYZ_NETWORK_MANAGER}/action/Reset data=${data}
+ ... ${NETWORK_MANAGER}/action/Reset data=${data}
Software Manager Factory Reset
[Documentation] Software Manager Factory Reset.