More double slash URL fixes
Fix TCs that reference HOST_WATCHDOG_URI.
Fix TCs that reference DUMP_ENTRY_URI.
Fix TCs that reference SOFTWARE_VERSION_URI.
FiX TCs that reference HOST_INVENTORY_URI.
Fix 'Get Endpoint Paths' keyword.
Change-Id: I77e5818a05ef5960ab8b0ffe14c1684ec9bbee39
Signed-off-by: Steven Sombar <ssombar@us.ibm.com>
diff --git a/lib/common_utils.robot b/lib/common_utils.robot
index 7c0d484..594cdd3 100755
--- a/lib/common_utils.robot
+++ b/lib/common_utils.robot
@@ -604,7 +604,7 @@
# openbmc_url URL for list operation (e.g.
# /xyz/openbmc_project/inventory).
- ${url_list}= Read Properties ${openbmc_url}/list quiet=${1}
+ ${url_list}= Read Properties ${openbmc_url}list quiet=${1}
Sort List ${url_list}
[Return] ${url_list}
diff --git a/lib/fan_utils.robot b/lib/fan_utils.robot
index dca4206..d00e236 100755
--- a/lib/fan_utils.robot
+++ b/lib/fan_utils.robot
@@ -11,7 +11,7 @@
[Documentation] Return 1 if system is water cooled, 0 othersise.
${water_cooled}= Read Attribute
- ... ${HOST_INVENTORY_URI}/system/chassis WaterCooled
+ ... ${HOST_INVENTORY_URI}system/chassis WaterCooled
[Return] ${water_cooled}
@@ -25,7 +25,7 @@
# fan_names The list of fan names to which new fan names are to be
# added to. This list is returned to the caller.
- ${fan_uris}= Get Endpoint Paths ${HOST_INVENTORY_URI}/system fan
+ ${fan_uris}= Get Endpoint Paths ${HOST_INVENTORY_URI}system fan
: FOR ${fan_uri} IN @{fan_uris}
\ ${fan_properties}= Read Properties ${fan_uri}
diff --git a/lib/openbmc_ffdc_methods.robot b/lib/openbmc_ffdc_methods.robot
index 0bad5b7..65caed7 100755
--- a/lib/openbmc_ffdc_methods.robot
+++ b/lib/openbmc_ffdc_methods.robot
@@ -453,7 +453,7 @@
[Documentation] Collect dumps from dump entry.
[Arguments] ${log_prefix_path}=${LOG_PREFIX}
- ${data}= Read Properties ${DUMP_ENTRY_URI}/enumerate quiet=${1}
+ ${data}= Read Properties ${DUMP_ENTRY_URI}enumerate quiet=${1}
# Grab the list of entries from dump/entry/
# The data shown below is the result of the "Get Dictionary Keys".
diff --git a/lib/utils.robot b/lib/utils.robot
index 29afce2..86101b5 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -12,6 +12,7 @@
Library Process
Library OperatingSystem
Library gen_print.py
+Library gen_misc.py
Library gen_robot_print.py
Library gen_cmd.py
Library gen_robot_keyword.py
@@ -476,7 +477,10 @@
# path URL path for enumeration.
# endpoint Endpoint string (url path ending).
- ${resp}= Read Properties ${path}/enumerate timeout=30
+ # Make sure path ends with slash.
+ ${path}= Add Trailing Slash ${path}
+
+ ${resp}= Read Properties ${path}enumerate timeout=30
Log Dictionary ${resp}
${list}= Get Dictionary Keys ${resp}