Add OPENBMC_BASE_URI and OPENBMC_BASE_DBUS global variables.
In the near future, the OpenBMC URI will start with "/xyz/openbmc_project"
instead of "/org/openbmc". This means all our existing tests and libraries
would be impacted.
To make the transition easier, new global variables are introduced in
resource.txt:
- base generic URI variable to hold the path
- ${OPENBMC_HOST} to EMPTY
This also fix the cyclic import of resource.txt file due to FFDC recent
changes which got merged.
Change-Id: I99351ea45eb700c418d17642c44e856de1df42ae
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/lib/openbmc_ffdc_list.py b/lib/openbmc_ffdc_list.py
index e71f0c4..a1feb0b 100755
--- a/lib/openbmc_ffdc_list.py
+++ b/lib/openbmc_ffdc_list.py
@@ -9,8 +9,6 @@
#############################################################
"""
-from robot.libraries.BuiltIn import BuiltIn
-
# -------------------
# FFDC default list
# -------------------
@@ -102,10 +100,9 @@
},
}
-# import variables from resource.txt file
-BuiltIn().import_resource('resource.txt')
-OPENBMC_BASE = BuiltIn().get_variable_value('${OPENBMC_BASE_URI}')
-
+# Enable when ready with openbmc/openbmc-test-automation#203
+# replace with new path /xyz/openbmc_project
+OPENBMC_BASE = '/org/openbmc/'
ENUMERATE_SENSORS = OPENBMC_BASE + 'sensors/enumerate'
ENUMERATE_SYSTEMS = OPENBMC_BASE + 'inventory/system/enumerate'
ENUMERATE_EVENTS = OPENBMC_BASE + 'records/events/enumerate'
diff --git a/lib/resource.txt b/lib/resource.txt
index 4c377ae..2d6cd3c 100755
--- a/lib/resource.txt
+++ b/lib/resource.txt
@@ -6,7 +6,7 @@
Variables ../data/variables.py
*** Variables ***
-${OPENBMC_HOST} 9.3.164.161
+${OPENBMC_HOST} ${EMPTY}
${DBUS_PREFIX} ${EMPTY}
${PORT} ${EMPTY}
# AUTH_SUFFIX here is derived from variables.py
@@ -38,6 +38,10 @@
${OS_PASSWORD} ${EMPTY}
${OS_WAIT_TIMEOUT} ${15*60}
+# OpenBMC base URI path is changing to /xyz/openbmc_project
+${OPENBMC_BASE_URI} /org/openbmc/
+${OPENBMC_BASE_DBUS} org.openbmc
+
*** Keywords ***
Get Inventory Schema
[Arguments] ${machine}