[VOL-3676] OpenOnu-Go-Adapter: Improvements for tests for OpenOnu-Go-Adapter

Change-Id: Id970b6e770dae517d3f81347212045dba117db0a
diff --git a/libraries/utils.robot b/libraries/utils.robot
old mode 100644
new mode 100755
index c0a146d..50e33f2
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -24,7 +24,7 @@
 Library           OperatingSystem
 Library           CORDRobot
 Library           ImportResource    resources=CORDRobot
-Resource          ./libraries/voltctl.robot
+Resource          ./voltctl.robot
 
 *** Keywords ***
 Check CLI Tools Configured
@@ -111,7 +111,8 @@
     ${count}=    Set Variable    0
     FOR    ${I}    IN RANGE    0     ${src_length}
         ${sn}    Evaluate    ${src}[${I}].get("olt")
-        ${count}=    Run Keyword If    '${serial_number}' == '${sn}'    Evaluate    ${count} + 1    ELSE  Set Variable  ${count}
+        ${count}=    Run Keyword If    '${serial_number}' == '${sn}'    Evaluate    ${count} + 1
+        ...          ELSE  Set Variable  ${count}
     END
     [Return]    ${count}
 
@@ -214,7 +215,8 @@
     ...    Sanity test performs authentication, dhcp and pings for all the ONUs given for the POD
     ...    This keyword can be used to call in any other tests where sanity check is required
     ...    and avoids duplication of code. - ATT workflow
-    #${of_id}=    Wait Until Keyword Succeeds    ${timeout}    15s    Validate OLT Device in ONOS    ${olt_serial_number}
+    #${of_id}=    Wait Until Keyword Succeeds    ${timeout}    15s
+    #...    Validate OLT Device in ONOS    ${olt_serial_number}
     #Set Global Variable    ${of_id}
     #${nni_port}=    Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2s
     #...    Get NNI Port in ONOS    ${of_id}