More double slash URL fixes
Fix SNMP test case library module.
Fix TCs that reference NETWORK_MANAGER.
Fix TCs that reference BMC_LOGGING_ENTRY.
Change-Id: I17070540062461ef2106e8e2aa7f43f835bf7fdd
Signed-off-by: Steven Sombar <ssombar@us.ibm.com>
diff --git a/extended/code_update/bmc_code_update.robot b/extended/code_update/bmc_code_update.robot
index c77a85f..c8ce076 100644
--- a/extended/code_update/bmc_code_update.robot
+++ b/extended/code_update/bmc_code_update.robot
@@ -85,7 +85,7 @@
... code update.
[Tags] Verify_Error_Log_Persistency
- ${error_log_paths}= Read Properties ${BMC_LOGGING_ENTRY}/list
+ ${error_log_paths}= Read Properties ${BMC_LOGGING_ENTRY}list
Log To Console ${error_log_paths}
${test_error_message}= Read Attribute @{error_log_paths}[-1] Message
Should Be Equal ${test_error_message}
diff --git a/extended/test_esel.robot b/extended/test_esel.robot
index 8e78b7a..e45dbf0 100644
--- a/extended/test_esel.robot
+++ b/extended/test_esel.robot
@@ -32,7 +32,7 @@
Create eSEL
# New eSEL log should exist
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}/list
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}list
Should Be Equal As Strings ${resp.status_code} ${HTTP_OK}
Verify eSEL Entries Using REST
diff --git a/gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot b/gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot
index 5a2de45..7b4dfb1 100644
--- a/gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot
+++ b/gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot
@@ -98,7 +98,7 @@
Check No Error Log Exist
[Documentation] No error log should be logged.
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}/list quiet=${1}
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}list quiet=${1}
Should Be Equal As Strings ${resp.status_code} ${HTTP_NOT_FOUND}
... msg=Codeupdate Failed with error.
diff --git a/lib/logging_utils.robot b/lib/logging_utils.robot
index 446bdd6..b13057c 100644
--- a/lib/logging_utils.robot
+++ b/lib/logging_utils.robot
@@ -162,7 +162,7 @@
Delete Error Logs And Verify
[Documentation] Delete all error logs and verify.
Delete All Error Logs
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}/list quiet=${1}
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}list quiet=${1}
Should Be Equal As Strings ${resp.status_code} ${HTTP_NOT_FOUND}
... msg=Error logs not deleted as expected.
diff --git a/lib/openbmc_ffdc_utils.robot b/lib/openbmc_ffdc_utils.robot
index 6c95dd4..182591d 100644
--- a/lib/openbmc_ffdc_utils.robot
+++ b/lib/openbmc_ffdc_utils.robot
@@ -123,7 +123,7 @@
Error Logs Should Not Exist
[Documentation] Verify that error logs do not exist.
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}/list quiet=${1}
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}list quiet=${1}
Should Be Equal As Strings ${resp.status_code} ${HTTP_NOT_FOUND}
... msg=Unexpected BMC error log(s) present.
@@ -131,6 +131,6 @@
Error Logs Should Exist
[Documentation] Verify that error logs exist.
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}/list quiet=${1}
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}list quiet=${1}
Run Keyword If ${resp.status_code} != ${HTTP_OK} Fail
... msg=Expected BMC error log(s) are not present.
diff --git a/lib/snmp/snmp_utils.robot b/lib/snmp/snmp_utils.robot
index 792afa1..3ede66a 100644
--- a/lib/snmp/snmp_utils.robot
+++ b/lib/snmp/snmp_utils.robot
@@ -34,7 +34,7 @@
${data}= Create Dictionary data=@{snmp_parm_list}
${resp}= OpenBMC Post Request
- ... ${SNMP_MANAGER_URI}/action/Client data=${data}
+ ... ${SNMP_MANAGER_URI}action/Client data=${data}
Run Keyword If '${expected_result}' == 'error'
... Should Be Equal As Strings
diff --git a/lib/utils.robot b/lib/utils.robot
index 51a6d03..29afce2 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -514,7 +514,7 @@
[Documentation] Delete error logs.
# Check if error logs entries exist, if not return.
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}${/}list quiet=${1}
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}list quiet=${1}
Return From Keyword If ${resp.status_code} == ${HTTP_NOT_FOUND}
# Get the list of error logs entries and delete them all.
diff --git a/mnfg/test_factory_reset.robot b/mnfg/test_factory_reset.robot
index 5718933..e0b5c6d 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
- ... ${NETWORK_MANAGER}/action/Reset data=${data}
+ ... ${NETWORK_MANAGER}action/Reset data=${data}
Software Manager Factory Reset
[Documentation] Software Manager Factory Reset.
diff --git a/network/test_bmc_network.robot b/network/test_bmc_network.robot
index bca18f5..f877c73 100644
--- a/network/test_bmc_network.robot
+++ b/network/test_bmc_network.robot
@@ -73,7 +73,7 @@
Verify MAC Address
[Documentation] Get MAC address and verify.
[Tags] Verify_MAC_Address
- ${macaddr}= Read Attribute ${NETWORK_MANAGER}/eth0 MACAddress
+ ${macaddr}= Read Attribute ${NETWORK_MANAGER}eth0 MACAddress
Validate MAC On BMC ${macaddr}
Add New Valid IP And Verify
@@ -382,7 +382,7 @@
[Documentation] Verify that the default gateway has a valid route.
[Tags] Verify_Default_Gateway.
- ${default_gw}= Read Attribute ${NETWORK_MANAGER}/config
+ ${default_gw}= Read Attribute ${NETWORK_MANAGER}config
... DefaultGateway
Validate Route On BMC ${default_gw}
@@ -391,7 +391,7 @@
... hostname configured on system.
[Tags] Verify_Hostname
- ${hostname}= Read Attribute ${NETWORK_MANAGER}/config HostName
+ ${hostname}= Read Attribute ${NETWORK_MANAGER}config HostName
Validate Hostname On BMC ${hostname}
Run IPMI With Multiple IPs Configured
@@ -444,7 +444,7 @@
# "/xyz/openbmc_project/network/eth0/ipv4/31f4ce8b"
# ],
- @{ipv4_uri_list}= Read Properties ${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}
@@ -523,7 +523,7 @@
${data}= Create Dictionary data=@{ip_parm_list}
Run Keyword And Ignore Error OpenBMC Post Request
- ... ${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. Then wait 15 seconds for new
diff --git a/network/test_mac.robot b/network/test_mac.robot
index dc34800..a175d60 100644
--- a/network/test_mac.robot
+++ b/network/test_mac.robot
@@ -121,7 +121,7 @@
Open Connection And Login
# Get BMC MAC address.
- ${macaddr}= Read Attribute ${NETWORK_MANAGER}/eth0 MACAddress
+ ${macaddr}= Read Attribute ${NETWORK_MANAGER}eth0 MACAddress
Validate MAC On BMC ${macaddr}
Set Suite Variable ${macaddr}
@@ -136,7 +136,7 @@
${data}= Create Dictionary data=${mac_addr}
Run Keyword And Ignore Error OpenBMC Put Request
- ... ${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/openpower/ras/test_host_ras.robot b/openpower/ras/test_host_ras.robot
index 1873329..085f980 100755
--- a/openpower/ras/test_host_ras.robot
+++ b/openpower/ras/test_host_ras.robot
@@ -348,7 +348,7 @@
# signature_desc Error log signature description.
# log_prefix Log path prefix.
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}/list
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}list
Should Not Be Equal As Strings ${resp.status_code} ${HTTP_NOT_FOUND}
Collect eSEL Log ${log_prefix}
diff --git a/tests/ipmi/test_general_ipmi.robot b/tests/ipmi/test_general_ipmi.robot
index 55896b5..d570cf5 100755
--- a/tests/ipmi/test_general_ipmi.robot
+++ b/tests/ipmi/test_general_ipmi.robot
@@ -485,7 +485,7 @@
${default_gateway_ipmi}= Fetch Details From LAN Print Default Gateway IP
# Verify "Default Gateway" using REST.
- Read Attribute ${NETWORK_MANAGER}/config DefaultGateway
+ Read Attribute ${NETWORK_MANAGER}config DefaultGateway
... expected_value=${default_gateway_ipmi}
@@ -511,7 +511,7 @@
# Verify "Mode" using REST.
${network_mode_rest}= Read Attribute
- ... ${NETWORK_MANAGER}/eth0 DHCPEnabled
+ ... ${NETWORK_MANAGER}eth0 DHCPEnabled
Run Keyword If '${network_mode_ipmi}' == 'Static Address'
... Should Be Equal ${network_mode_rest} ${0}
... msg=Verification of network setting failed.