Update test suites with new URI changes

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

Change-Id: I3fa314f51d0b52e36649f0bfa605a02a3820e875
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/tests/test_bootpolicy.robot b/tests/test_bootpolicy.robot
index fdb7166..2f26d6f 100644
--- a/tests/test_bootpolicy.robot
+++ b/tests/test_bootpolicy.robot
@@ -13,6 +13,7 @@
 Test Teardown      FFDC On Test Case Fail
 
 *** Variables ***
+${HOST_SETTINGS}    ${SETTINGS_URI}host0
 
 *** Test Cases ***
 
@@ -22,7 +23,7 @@
 
     Set Boot Policy   ONETIME
 
-    ${boot}=   Read Attribute  /org/openbmc/settings/host0    boot_policy
+    ${boot}=   Read Attribute  ${HOST_SETTINGS}   boot_policy
     Should Be Equal    ${boot}    ONETIME
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -34,7 +35,7 @@
 
     Set Boot Policy   PERMANENT
 
-    ${boot}=   Read Attribute  /org/openbmc/settings/host0    boot_policy
+    ${boot}=   Read Attribute  ${HOST_SETTINGS}  boot_policy
     Should Be Equal    ${boot}    PERMANENT
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -45,7 +46,7 @@
     ...               and then verify using REST URI and ipmitool.\n
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x00 0x00 0x00 0x00
-    ${boot}=   Read Attribute  /org/openbmc/settings/host0    boot_policy
+    ${boot}=   Read Attribute  ${HOST_SETTINGS}   boot_policy
     Should Be Equal    ${boot}    ONETIME
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -56,7 +57,7 @@
     ...               and then verify using REST URI and ipmitool.
 
     Run IPMI command   0x0 0x8 0x05 0xC0 0x00 0x00 0x00 0x00
-    ${boot}=   Read Attribute  /org/openbmc/settings/host0    boot_policy
+    ${boot}=   Read Attribute  ${HOST_SETTINGS}   boot_policy
     Should Be Equal    ${boot}    PERMANENT
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -75,10 +76,10 @@
 
     Initiate Power On
 
-    ${boot}=   Read Attribute  /org/openbmc/settings/host0    boot_policy
+    ${boot}=   Read Attribute  ${HOST_SETTINGS}   boot_policy
     Should Be Equal    ${boot}    PERMANENT
 
-    ${flag}=   Read Attribute  /org/openbmc/settings/host0    boot_flags
+    ${flag}=   Read Attribute  ${HOST_SETTINGS}   boot_flags
     Should Be Equal    ${flag}    CDROM
 
 Persist ONETIME Boot Policy After Reset
@@ -94,10 +95,10 @@
 
     Trigger Warm Reset
 
-    ${boot}=   Read Attribute  /org/openbmc/settings/host0    boot_policy
+    ${boot}=   Read Attribute  ${HOST_SETTINGS}   boot_policy
     Should Be Equal    ${boot}    ONETIME
 
-    ${flag}=   Read Attribute  /org/openbmc/settings/host0    boot_flags
+    ${flag}=   Read Attribute  ${HOST_SETTINGS}  boot_flags
     Should Be Equal    ${flag}    Network
 
 Persist PERMANENT Boot Policy After Reset
@@ -113,10 +114,10 @@
 
     Trigger Warm Reset
 
-    ${boot}=   Read Attribute  /org/openbmc/settings/host0    boot_policy
+    ${boot}=   Read Attribute  ${HOST_SETTINGS}   boot_policy
     Should Be Equal    ${boot}    PERMANENT
 
-    ${flag}=   Read Attribute  /org/openbmc/settings/host0    boot_flags
+    ${flag}=   Read Attribute  ${HOST_SETTINGS}   boot_flags
     Should Be Equal    ${flag}    CDROM
 
 Set boot policy to invalid value
@@ -126,7 +127,7 @@
 
     Run Keyword and Ignore Error    Set Boot Policy   abc
 
-    ${boot}=   Read Attribute  /org/openbmc/settings/host0    boot_policy
+    ${boot}=   Read Attribute  ${HOST_SETTINGS}   boot_policy
     Should Not Be Equal    ${boot}    abc
 
 *** Keywords ***
@@ -135,13 +136,13 @@
     [Arguments]    ${args}
     ${bootpolicy}=   Set Variable   ${args}
     ${valueDict}=   create dictionary   data=${bootpolicy}
-    Write Attribute    /org/openbmc/settings/host0   boot_policy   data=${valueDict}
+    Write Attribute    ${HOST_SETTINGS}  boot_policy   data=${valueDict}
 
 Set Boot Device
     [Arguments]    ${args}
-    ${bootDevice}=   Set Variable   ${args}
-    ${valueDict}=   create dictionary   data=${bootDevice}
-    Write Attribute    /org/openbmc/settings/host0   boot_flags   data=${valueDict}
+    ${bootDevice} =   Set Variable   ${args}
+    ${valueDict} =   create dictionary   data=${bootDevice}
+    Write Attribute    ${HOST_SETTINGS}   boot_flags   data=${valueDict}