Fix code bugs in test automation

This changes fixes:
    - Invalid keyword usage
    - To avoid multiple keywords error with same name
      'Open connection' existing in SSH and SCP library

Resolves openbmc/openbmc-test-automation#85

Change-Id: I1353fe1a615e72d98aab0c33189c5cc1ddc8c5fb
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/tests/test_bootpolicy.robot b/tests/test_bootpolicy.robot
index f02590e..32e2477 100644
--- a/tests/test_bootpolicy.robot
+++ b/tests/test_bootpolicy.robot
@@ -18,7 +18,7 @@
 Set Onetime boot policy using REST
     [Documentation]   This testcase is to set onetime boot policy using REST
     ...               URI and then verify using REST API and ipmitool.\n
- 
+
     Set Boot Policy   ONETIME
 
     ${boot} =   Read Attribute  /org/openbmc/settings/host0    boot_policy
@@ -46,7 +46,7 @@
     Should Be Equal    ${boot}    ONETIME
     ${output} =   Run IPMI Standard command   chassis bootparam get 5
     Should Contain   ${output}   Options apply to only next boot
- 
+
 Set Permanent boot policy using IPMITOOL
     [Documentation]   This testcase is to set boot policy to permanent using ipmitool
     ...               and then verify using REST URI and ipmitool.
@@ -97,7 +97,7 @@
     Should Be Equal    ${flag}    Network
 
 Permanent boot order after warm reset
-    [Documentation]   This testcase is to verify that boot policy and order does not change  
+    [Documentation]   This testcase is to verify that boot policy and order does not change
     ...               after warm reset on a system with permanent boot policy.
     [Tags]  chassisboot
 
@@ -114,16 +114,16 @@
 
     ${flag} =   Read Attribute  /org/openbmc/settings/host0    boot_flags
     Should Be Equal    ${flag}    CDROM
- 
+
 Set boot policy to invalid value
-    [Documentation]   This testcase is to verify that proper error message is prompted  
+    [Documentation]   This testcase is to verify that proper error message is prompted
     ...               when invalid value to provided to boot policy.
-   
+
     Set Boot Policy   abc
 
     ${boot} =   Read Attribute  /org/openbmc/settings/host0    boot_policy
-    Should Be Not Equal    ${boot}    abc
-    
+    Should Not Be Equal    ${boot}    abc
+
 *** Keywords ***
 
 Set Boot Policy