commit daf9134d893979c48f0af9ee6c18386e2ea14128
author Sweta Potthuri <spotthur@in.ibm.com> Thu Sep 07 12:05:56 2017 -0500
committer George Keishing <gkeishin@in.ibm.com> Mon Oct 23 05:18:49 2017 +0000
tree 6d26a954523b019de7df6ad601b56f26c30a8399
parent ef74a8c87a82aab7310ae23d7ae536e297ef3eea

Remove all the org from data/variable.py.

Resolves openbmc/openbmc-test-automation#960

Change-Id: I4f4f99d51b5e7187a3dad9818cbbab9802d39db5
Signed-off-by: Sweta Potthuri <spotthur@in.ibm.com>

data/variables.py

diff --git a/data/variables.py b/data/variables.py
index 342c5ee..696317f 100644
--- a/data/variables.py
+++ b/data/variables.py
@@ -1,9 +1,7 @@
 import os
 
-# Enable when ready with openbmc/openbmc-test-automation#203
-# replace with new path /xyz/openbmc_project
-OPENBMC_BASE_URI = '/org/openbmc/'
-OPENBMC_BASE_DBUS = 'org.openbmc'
+OPENBMC_BASE_URI = '/xyz/openbmc_project/'
+OPENBMC_BASE_DBUS = 'xyz.openbmc_project.'
 
 # org open power base URI.
 OPENPOWER_BASE_URI = '/org/open_power/'
@@ -11,20 +9,15 @@
 
 # REST URI base endpoint paths.
 CONTROL_URI = OPENBMC_BASE_URI + 'control/'
-RECORDS_URI = OPENBMC_BASE_URI + 'records/'
-BUTTONS_URI = OPENBMC_BASE_URI + 'buttons/'
 SETTINGS_URI = OPENBMC_BASE_URI + 'settings/'
 WATCHDOG_URI = OPENBMC_BASE_URI + 'watchdog/'
-INVENTORY_URI = OPENBMC_BASE_URI + 'inventory/'
-USER_MANAGER_URI = OPENBMC_BASE_URI + 'UserManager/'
-NETWORK_MANAGER_URI = OPENBMC_BASE_URI + 'NetworkManager/'
-TIME_MANAGER_URI = OPENBMC_BASE_URI + 'TimeManager/'
-XYZ_NETWORK_MANAGER = '/xyz/openbmc_project/network/'
+TIME_MANAGER_URI = OPENBMC_BASE_URI + 'time/'
+XYZ_NETWORK_MANAGER = OPENBMC_BASE_URI + 'network/'
 
 # Sensors base variables.
-SENSORS_URI = '/xyz/openbmc_project/sensors/'
+SENSORS_URI =  OPENBMC_BASE_URI + 'sensors/'
 
-# State Manager base variables.
+# State Manager base variables
 BMC_REBOOT_TRANS = 'xyz.openbmc_project.State.BMC.Transition.Reboot'
 
 HOST_POWEROFF_TRANS = 'xyz.openbmc_project.State.Host.Transition.Off'
@@ -39,18 +32,18 @@
 CHASSIS_POWERON_STATE = 'xyz.openbmc_project.State.Chassis.PowerState.On'
 
 # State Manager URI variables.
-SYSTEM_STATE_URI = '/xyz/openbmc_project/state/'
-BMC_STATE_URI = '/xyz/openbmc_project/state/bmc0/'
-HOST_STATE_URI = '/xyz/openbmc_project/state/host0/'
-CHASSIS_STATE_URI = '/xyz/openbmc_project/state/chassis0/'
-HOST_WATCHDOG_URI = '/xyz/openbmc_project/watchdog/host0/'
+SYSTEM_STATE_URI = OPENBMC_BASE_URI + 'state/'
+BMC_STATE_URI = OPENBMC_BASE_URI + 'state/bmc0/'
+HOST_STATE_URI = OPENBMC_BASE_URI + 'state/host0/'
+CHASSIS_STATE_URI = OPENBMC_BASE_URI + 'state/chassis0/'
+HOST_WATCHDOG_URI = OPENBMC_BASE_URI + 'watchdog/host0/'
 
 # Logging URI variables
-BMC_LOGGING_URI = '/xyz/openbmc_project/logging/'
+BMC_LOGGING_URI = OPENBMC_BASE_URI + 'logging/'
 BMC_LOGGING_ENTRY = BMC_LOGGING_URI + 'entry/'
 
 # Software manager version
-SOFTWARE_VERSION_URI = '/xyz/openbmc_project/software/'
+SOFTWARE_VERSION_URI = OPENBMC_BASE_URI + 'software/'
 ACTIVE = 'xyz.openbmc_project.Software.Activation.Activations.Active'
 READY = 'xyz.openbmc_project.Software.Activation.Activations.Ready'
 INVALID = 'xyz.openbmc_project.Software.Activation.Activations.Invalid'
@@ -59,8 +52,6 @@
 FAILED = 'xyz.openbmc_project.Software.Activation.Activations.Failed'
 
 SOFTWARE_ACTIVATION = 'xyz.openbmc_project.Software.Activation'
-REQUESTED_ACTIVATION = SOFTWARE_ACTIVATION + '.RequestedActivations'
-REQUESTED_ACTIVE = REQUESTED_ACTIVATION + '.Active'
 REQUESTED_NONE = REQUESTED_ACTIVATION + '.None'
 
 SOFTWARE_PURPOSE = 'xyz.openbmc_project.Software.Version.VersionPurpose'
@@ -72,14 +63,14 @@
 IMAGE_UPLOAD_DIR_PATH = '/tmp/images/'
 
 # Inventory URI
-HOST_INVENTORY_URI = '/xyz/openbmc_project/inventory/'
+HOST_INVENTORY_URI = OPENBMC_BASE_URI + 'inventory/'
 
 # Led URI variable
-LED_GROUPS_URI = '/xyz/openbmc_project/led/groups/'
-LED_PHYSICAL_URI = '/xyz/openbmc_project/led/physical/'
+LED_GROUPS_URI = OPENBMC_BASE_URI + 'led/groups/'
+LED_PHYSICAL_URI = OPENBMC_BASE_URI + 'led/physical/'
 
 # Host control URI variables.
-CONTROL_HOST_URI = '/xyz/openbmc_project/control/host0/'
+CONTROL_HOST_URI = OPENBMC_BASE_URI + 'control/host0/'
 
 # Power restore variables.
 POWER_RESTORE_URI = CONTROL_HOST_URI + 'power_restore_policy'
@@ -90,7 +81,7 @@
 ALWAYS_POWER_OFF = CONTROL_DBUS_BASE + 'Power.RestorePolicy.Policy.AlwaysOff'
 
 # Dump URI variable
-DUMP_URI = '/xyz/openbmc_project/dump/'
+DUMP_URI = OPENBMC_BASE_URI +'/dump/'
 DUMP_ENTRY_URI = DUMP_URI + 'entry/'
 
 # Boot progress variables.