Fix REST vs Redfish dump URI
Change-Id: Ib41ee7fc138bfb5483e430146f61b7de0dbdbe29
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/data/variables.py b/data/variables.py
index 8bad6a3..295b673 100755
--- a/data/variables.py
+++ b/data/variables.py
@@ -98,8 +98,8 @@
ALWAYS_POWER_OFF = CONTROL_DBUS_BASE + 'Power.RestorePolicy.Policy.AlwaysOff'
# Dump URI variables.
-DUMP_URI = OPENBMC_BASE_URI + 'dump/bmc/'
-DUMP_ENTRY_URI = DUMP_URI + 'entry/'
+REST_DUMP_URI = OPENBMC_BASE_URI + 'dump/bmc/'
+DUMP_ENTRY_URI = REST_DUMP_URI + 'entry/'
DUMP_DOWNLOAD_URI = "/download/dump/"
# The path on the BMC where dumps are stored.
DUMP_DIR_PATH = "/var/lib/phosphor-debug-collector/dumps/"
diff --git a/lib/dump_utils.robot b/lib/dump_utils.robot
index 4c1646c..81db023 100644
--- a/lib/dump_utils.robot
+++ b/lib/dump_utils.robot
@@ -21,13 +21,13 @@
# returned if out of dump space was
# detected when creating the dump.
- ${resp}= OpenBMC Get Request ${DUMP_URI}
+ ${resp}= OpenBMC Get Request ${REST_DUMP_URI}
Run Keyword If '${resp.status_code}' == '${HTTP_NOT_FOUND}'
- ... Set Global Variable ${DUMP_URI} /xyz/openbmc_project/dump/
+ ... Set Global Variable ${REST_DUMP_URI} /xyz/openbmc_project/dump/
${data}= Create Dictionary data=@{EMPTY}
${resp}= OpenBMC Post Request
- ... ${DUMP_URI}action/CreateDump data=${data} quiet=${1}
+ ... ${REST_DUMP_URI}action/CreateDump data=${data} quiet=${1}
Run Keyword If '${check_out_of_space}' == '${False}'
... Run Keyword And Return Get The Dump Id ${resp}
@@ -112,7 +112,7 @@
# dump_id An integer value that identifies a particular dump
# object(e.g. 1, 3, 5).
- ${resp}= OpenBMC Get Request ${DUMP_URI}
+ ${resp}= OpenBMC Get Request ${REST_DUMP_URI}
Run Keyword If '${resp.status_code}' == '${HTTP_NOT_FOUND}'
... Set Global Variable ${DUMP_ENTRY_URI} /xyz/openbmc_project/dump/entry/
@@ -127,7 +127,7 @@
# Description of Argument(s):
# dump_id An integer value that identifies a particular dump (e.g. 1, 3).
- ${resp}= OpenBMC Get Request ${DUMP_URI}
+ ${resp}= OpenBMC Get Request ${REST_DUMP_URI}
Run Keyword If '${resp.status_code}' == '${HTTP_NOT_FOUND}'
... Set Global Variable ${DUMP_ENTRY_URI} /xyz/openbmc_project/dump/entry/
@@ -140,7 +140,7 @@
Delete All Dumps
[Documentation] Delete all dumps.
- ${resp}= OpenBMC Get Request ${DUMP_URI}
+ ${resp}= OpenBMC Get Request ${REST_DUMP_URI}
Run Keyword If '${resp.status_code}' == '${HTTP_NOT_FOUND}'
... Set Global Variable ${DUMP_ENTRY_URI} /xyz/openbmc_project/dump/entry/
@@ -185,18 +185,18 @@
Delete All BMC Dump
[Documentation] Delete all BMC dump entries using "DeleteAll" interface.
- ${resp}= OpenBMC Get Request ${DUMP_URI}
+ ${resp}= OpenBMC Get Request ${REST_DUMP_URI}
Run Keyword If '${resp.status_code}' == '${HTTP_NOT_FOUND}'
- ... Set Global Variable ${DUMP_URI} /xyz/openbmc_project/dump/
+ ... Set Global Variable ${REST_DUMP_URI} /xyz/openbmc_project/dump/
${data}= Create Dictionary data=@{EMPTY}
- ${resp}= Openbmc Post Request ${DUMP_URI}action/DeleteAll data=${data}
+ ${resp}= Openbmc Post Request ${REST_DUMP_URI}action/DeleteAll data=${data}
Should Be Equal As Strings ${resp.status_code} ${HTTP_OK}
Dump Should Not Exist
[Documentation] Verify that BMC dumps do not exist.
- ${resp}= OpenBMC Get Request ${DUMP_URI}
+ ${resp}= OpenBMC Get Request ${REST_DUMP_URI}
Run Keyword If '${resp.status_code}' == '${HTTP_NOT_FOUND}'
... Set Global Variable ${DUMP_ENTRY_URI} /xyz/openbmc_project/dump/entry/
@@ -223,7 +223,7 @@
Get Dump Entries
[Documentation] Return dump entries list.
- ${resp}= OpenBMC Get Request ${DUMP_URI}
+ ${resp}= OpenBMC Get Request ${REST_DUMP_URI}
Run Keyword If '${resp.status_code}' == '${HTTP_NOT_FOUND}'
... Set Global Variable ${DUMP_ENTRY_URI} /xyz/openbmc_project/dump/entry/