commit ab1bd924e711b7fbc14f4d6229d502236f018e9f
author George Keishing <gkeishin@in.ibm.com> Mon Dec 05 05:29:59 2016 -0600
committer Andrew Geissler <geissonator@yahoo.com> Tue Dec 13 16:37:29 2016 +0000
tree 022b296cd43858a5cd922d58d2d56930f7ee5d61
parent ec807372e182c0daea5a672060c03c554b1a436e

Test suites with new URI changes

This changes addresses:
   - variables updation with new URI
   - Fix minor spacing exceeding 80 characters

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

tests/test_occ_powercap.robot

diff --git a/tests/test_occ_powercap.robot b/tests/test_occ_powercap.robot
index c424b5e..e5ce8f0 100644
--- a/tests/test_occ_powercap.robot
+++ b/tests/test_occ_powercap.robot
@@ -12,6 +12,8 @@
 
 Force Tags   powercapping
 
+*** Variables ***
+
 *** Test Cases ***
 
 Get OCC status
@@ -88,7 +90,7 @@
     ...               value is greater than zero
     [Tags]  Get_System_Power_Consumption
 
-    ${resp}=   OpenBMC Get Request   /org/openbmc/sensors/powercap/system_power
+    ${resp}=   OpenBMC Get Request   ${SENSORS_URI}powercap/system_power
     should be equal as strings   ${resp.status_code}   ${HTTP_OK}
     ${jsondata}=   To Json    ${resp.content}
     Should Be True   ${jsondata["data"]["value"]} > 0
@@ -96,17 +98,18 @@
 *** Keywords ***
 
 Get Minimum PowerCap
-    ${resp}=   OpenBMC Get Request    /org/openbmc/sensors/powercap/min_cap
+    ${resp}=   OpenBMC Get Request
+    ...    ${SENSORS_URI}powercap/min_cap
     ${jsondata}=   To Json    ${resp.content}
     [return]    ${jsondata["data"]["value"]}
 
 Get Maximum PowerCap
-    ${resp}=   OpenBMC Get Request    /org/openbmc/sensors/powercap/max_cap
+    ${resp}=   OpenBMC Get Request   ${SENSORS_URI}powercap/max_cap
     ${jsondata}=   To Json    ${resp.content}
     [return]    ${jsondata["data"]["value"]}
 
 Get User PowerCap
-    ${resp}=   OpenBMC Get Request    /org/openbmc/sensors/powercap/user_cap
+    ${resp}=   OpenBMC Get Request   ${SENSORS_URI}powercap/user_cap
     ${jsondata}=   To Json    ${resp.content}
     [return]    ${jsondata["data"]["value"]}
 
@@ -114,16 +117,19 @@
     [Arguments]    ${powercap_value}
     @{pcap_list}=   Create List     ${powercap_value}
     ${data}=   create dictionary   data=@{pcap_list}
-    ${resp}=   openbmc post request    /org/openbmc/sensors/host/powercap/action/setValue      data=${data}
+    ${resp}=   openbmc post request
+    ...    ${SENSORS_URI}host/powercap/action/setValue      data=${data}
     [return]    ${resp}
 
 Get PowerCap
-    ${resp}=   OpenBMC Get Request    /org/openbmc/sensors/host/powercap
+    ${resp}=   OpenBMC Get Request
+    ...    ${SENSORS_URI}host/powercap
     ${jsondata}=   To Json    ${resp.content}
     [return]    ${jsondata["data"]["value"]}
 
 Get OCC status link
-    ${resp}=    OpenBMC Get Request     /org/openbmc/sensors/host/list
+    ${resp}=    OpenBMC Get Request
+    ...     ${SENSORS_URI}host/list
     ${jsondata}=   To Json    ${resp.content}
     log     ${jsondata}
     : FOR    ${ELEMENT}    IN    @{jsondata["data"]}
@@ -139,7 +145,7 @@
     [return]    ${jsondata["data"]}
 
 Get Chassis URI
-    ${resp}=    OpenBMC Get Request     /org/openbmc/control/
+    ${resp}=    OpenBMC Get Request     ${OPENBMC_BASE_URI}control/
     ${jsondata}=   To Json    ${resp.content}
     log     ${jsondata}
     : FOR    ${ELEMENT}    IN    @{jsondata["data"]}
@@ -163,13 +169,13 @@
 Powercap Attributes Activated
     [Documentation]   Verify if the response contains the pre-define list
 
-    @{precheck}=   Create List   /org/openbmc/sensors/powercap/user_cap
-    ...                          /org/openbmc/sensors/powercap/system_power
-    ...                          /org/openbmc/sensors/powercap/curr_cap
-    ...                          /org/openbmc/sensors/powercap/max_cap
-    ...                          /org/openbmc/sensors/powercap/min_cap
+    @{precheck}=   Create List   ${SENSORS_URI}powercap/user_cap
+    ...                          ${SENSORS_URI}powercap/system_power
+    ...                          ${SENSORS_URI}powercap/curr_cap
+    ...                          ${SENSORS_URI}powercap/max_cap
+    ...                          ${SENSORS_URI}powercap/min_cap
 
-    ${resp}=    OpenBMC Get Request   /org/openbmc/sensors/powercap/
+    ${resp}=    OpenBMC Get Request  ${SENSORS_URI}powercap/
     ${jsondata}=   To Json    ${resp.content}
     List Should Contain Sub List   ${jsondata["data"]}    ${precheck}
     ...     msg=Failed to activate powercap interface attributes