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_boot.robot b/tests/test_boot.robot
index 89fbd8c..ca8aad9 100644
--- a/tests/test_boot.robot
+++ b/tests/test_boot.robot
@@ -11,8 +11,11 @@
 Suite Teardown  Close All Connections
 Test Setup      Initialize DBUS cmd   "boot_flags"
 Test Teardown   FFDC On Test Case Fail
+
 *** Variables ***
 
+${HOST_SETTINGS}    ${SETTINGS_URI}host0
+
 *** Test Cases ***
 
 Set the Boot Device as Default using REST API
@@ -21,8 +24,8 @@
 
     ${bootDevice}=   Set Variable   Default
     ${valueDict}=   create dictionary   data=${bootDevice}
-    Write Attribute    /org/openbmc/settings/host0   boot_flags   data=${valueDict}
-    Read the Attribute  /org/openbmc/settings/host0    boot_flags
+    Write Attribute     ${HOST_SETTINGS}   boot_flags   data=${valueDict}
+    Read the Attribute  ${HOST_SETTINGS}   boot_flags
     Response Should Be Equal   Default
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -34,7 +37,7 @@
    ...               ipmitool.
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x00 0x00 0x00 0x00
-    Read the Attribute   /org/openbmc/settings/host0   boot_flags
+    Read the Attribute   ${HOST_SETTINGS}   boot_flags
     Response Should Be Equal   Default
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -46,8 +49,8 @@
 
     ${bootDevice}=   Set Variable   Network
     ${valueDict}=   create dictionary   data=${bootDevice}
-    Write Attribute    /org/openbmc/settings/host0   boot_flags   data=${valueDict}
-    Read the Attribute  /org/openbmc/settings/host0    boot_flags
+    Write Attribute    ${HOST_SETTINGS}  boot_flags   data=${valueDict}
+    Read the Attribute  ${HOST_SETTINGS}    boot_flags
     Response Should Be Equal   Network
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}   return_stderr=True
     Should Be Empty     ${stderr}
@@ -59,7 +62,7 @@
    ...               ipmitool.
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x04 0x00 0x00 0x00
-    Read the Attribute   /org/openbmc/settings/host0   boot_flags
+    Read the Attribute   ${HOST_SETTINGS}   boot_flags
     Response Should Be Equal   Network
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -71,8 +74,8 @@
 
     ${bootDevice}=   Set Variable   Disk
     ${valueDict}=   create dictionary   data=${bootDevice}
-    Write Attribute    /org/openbmc/settings/host0   boot_flags   data=${valueDict}
-    Read the Attribute  /org/openbmc/settings/host0    boot_flags
+    Write Attribute     ${HOST_SETTINGS}  boot_flags   data=${valueDict}
+    Read the Attribute  ${HOST_SETTINGS}  boot_flags
     Response Should Be Equal   Disk
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -84,7 +87,7 @@
    ...               ipmitool.
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x08 0x00 0x00 0x00
-    Read the Attribute   /org/openbmc/settings/host0   boot_flags
+    Read the Attribute   ${HOST_SETTINGS}   boot_flags
     Response Should Be Equal   Disk
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -96,8 +99,8 @@
 
     ${bootDevice}=   Set Variable   Safe
     ${valueDict}=   create dictionary   data=${bootDevice}
-    Write Attribute    /org/openbmc/settings/host0   boot_flags   data=${valueDict}
-    Read the Attribute  /org/openbmc/settings/host0    boot_flags
+    Write Attribute     ${HOST_SETTINGS}   boot_flags   data=${valueDict}
+    Read the Attribute  ${HOST_SETTINGS}   boot_flags
     Response Should Be Equal   Safe
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -109,7 +112,7 @@
    ...               ipmitool.
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x0C 0x00 0x00 0x00
-    Read the Attribute   /org/openbmc/settings/host0   boot_flags
+    Read the Attribute   ${HOST_SETTINGS}   boot_flags
     Response Should Be Equal   Safe
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}   return_stderr=True
     Should Be Empty     ${stderr}
@@ -121,8 +124,8 @@
 
     ${bootDevice}=   Set Variable   CDROM
     ${valueDict}=   create dictionary   data=${bootDevice}
-    Write Attribute    /org/openbmc/settings/host0   boot_flags   data=${valueDict}
-    Read the Attribute  /org/openbmc/settings/host0    boot_flags
+    Write Attribute     ${HOST_SETTINGS}   boot_flags   data=${valueDict}
+    Read the Attribute  ${HOST_SETTINGS}   boot_flags
     Response Should Be Equal   CDROM
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -134,7 +137,7 @@
    ...               ipmitool.
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x14 0x00 0x00 0x00
-    Read the Attribute   /org/openbmc/settings/host0   boot_flags
+    Read the Attribute   ${HOST_SETTINGS}   boot_flags
     Response Should Be Equal   CDROM
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -146,8 +149,8 @@
 
     ${bootDevice}=   Set Variable   Setup
     ${valueDict}=   create dictionary   data=${bootDevice}
-    Write Attribute    /org/openbmc/settings/host0   boot_flags   data=${valueDict}
-    Read the Attribute  /org/openbmc/settings/host0    boot_flags
+    Write Attribute     ${HOST_SETTINGS}   boot_flags   data=${valueDict}
+    Read the Attribute  ${HOST_SETTINGS}   boot_flags
     Response Should Be Equal   Setup
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}  return_stderr=True
     Should Be Empty     ${stderr}
@@ -159,7 +162,7 @@
    ...               ipmitool.
 
     Run IPMI command   0x0 0x8 0x05 0x80 0x18 0x00 0x00 0x00
-    Read the Attribute   /org/openbmc/settings/host0   boot_flags
+    Read the Attribute   ${HOST_SETTINGS}   boot_flags
     Response Should Be Equal   Setup
     ${output}   ${stderr}=  Execute Command  ${dbuscmd}   return_stderr=True
     Should Be Empty     ${stderr}