commit bec365b6d50f9347dc11d6d107a8d82f2503035e
author George Keishing <gkeishin@in.ibm.com> Thu Jan 19 01:28:41 2017 -0600
committer Andrew Geissler <geissonator@yahoo.com> Wed Jan 25 02:08:21 2017 +0000
tree a341c0a0961f58b2aa04b109e28bb0e96374d211
parent 7d805b2b4cb0cb5c36937bc1deb359659c2540bf

State manager variables

The variables defined earlier in state_manager.robot are now moved
to data/variables.py.

Resolves openbmc/openbmc-test-automation#274

Change-Id: If8e80bc27a719132fb0c906fba90fedeaf4af663
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

data/variables.py

diff --git a/data/variables.py b/data/variables.py
index 1a8c84f..c0340bb 100644
--- a/data/variables.py
+++ b/data/variables.py
@@ -17,6 +17,22 @@
 NETWORK_MANAGER_URI = OPENBMC_BASE_URI + 'NetworkManager/'
 TIME_MANAGER_URI = OPENBMC_BASE_URI + 'TimeManager/'
 
+# State Manager base variables.
+HOST_POWEROFF_TRANS = 'xyz.openbmc_project.State.Host.Transition.Off'
+HOST_POWERON_TRANS = 'xyz.openbmc_project.State.Host.Transition.On'
+HOST_POWEROFF_STATE = 'xyz.openbmc_project.State.Host.HostState.Off'
+HOST_POWERON_STATE = 'xyz.openbmc_project.State.Host.HostState.Running'
+
+CHASSIS_POWEROFF_TRANS = 'xyz.openbmc_project.State.Chassis.Transition.Off'
+CHASSIS_POWERON_TRANS = 'xyz.openbmc_project.State.Chassis.Transition.On'
+CHASSIS_POWEROFF_STATE = 'xyz.openbmc_project.State.Chassis.PowerState.Off'
+CHASSIS_POWERON_STATE = 'xyz.openbmc_project.State.Chassis.PowerState.On'
+
+# State Manager URI variables.
+BMC_STATE_URI = '/xyz/openbmc_project/state/BMC0/'
+HOST_STATE_URI = '/xyz/openbmc_project/state/host0/'
+CHASSIS_STATE_URI = '/xyz/openbmc_project/state/chassis0/'
+
 '''
   QEMU HTTPS variable:
 

lib/state_manager.robot

diff --git a/lib/state_manager.robot b/lib/state_manager.robot
index ada66dd..0ff1456 100755
--- a/lib/state_manager.robot
+++ b/lib/state_manager.robot
@@ -1,26 +1,9 @@
 *** Settings ***
-Resource                ../lib/utils.robot
+Resource          ../lib/utils.robot
+Variables         ../data/variables.py
 
 *** Variables ***
 
-# Once the State Manager support is ready remove this variables block
-# and use appropriate resource or variable file imports
-
-# State Manager States
-${HOST_POWEROFF_TRANS}       xyz.openbmc_project.State.Host.Transition.Off
-${HOST_POWERON_TRANS}        xyz.openbmc_project.State.Host.Transition.On
-${HOST_POWEROFF_STATE}       xyz.openbmc_project.State.Host.HostState.Off
-${HOST_POWERON_STATE}        xyz.openbmc_project.State.Host.HostState.Running
-
-${CHASSIS_POWEROFF_TRANS}    xyz.openbmc_project.State.Chassis.Transition.Off
-${CHASSIS_POWERON_TRANS}     xyz.openbmc_project.State.Chassis.Transition.On
-${CHASSIS_POWEROFF_STATE}    xyz.openbmc_project.State.Chassis.PowerState.Off
-${CHASSIS_POWERON_STATE}     xyz.openbmc_project.State.Chassis.PowerState.On
-
-# State Manager URI's
-${HOST_STATE_URI}           /xyz/openbmc_project/state/host0/
-${CHASSIS_STATE_URI}        /xyz/openbmc_project/state/chassis0/
-
 ${QUIET}  ${0}
 
 *** Keywords ***