fixing test keywords

Change-Id: Idb15bc53592046bc86c37f6eb1deb07303a8d875
diff --git a/libraries/onos.robot b/libraries/onos.robot
index 8719819..3a65ec8 100644
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -57,13 +57,13 @@
     Should Contain    ${eapol_flows_added}    ${expected_onus}
 
 Verify Number of AAA-Users
-    [Arguments]    ${expected_onus}
+    [Arguments]    ${ip}    ${port}    ${expected_onus}
     [Documentation]    Matches for number of aaa-users authorized based on number of onus
-    ${aaa_users}=    Execute ONOS Command    aaa-users | grep AUTHORIZED | wc -l
+    ${aaa_users}=    Execute ONOS Command    ${ip}    ${port}    aaa-users | grep AUTHORIZED | wc -l
     Should Contain    ${aaa_users}    ${expected_onus}
 
 Validate DHCP Allocations
-    [Arguments]    ${expected_onus}
+    [Arguments]    ${ip}    ${port}    ${expected_onus}
     [Documentation]    Matches for number of dhcpacks based on number of onus
-    ${allocations}=    Execute ONOS Command    dhcpl2relay-allocations | grep DHCPACK | wc -l
+    ${allocations}=    Execute ONOS Command    ${ip}    ${port}    dhcpl2relay-allocations | grep DHCPACK | wc -l
     Should Contain    ${allocations}    ${expected_onus}
\ No newline at end of file
diff --git a/libraries/voltctl.robot b/libraries/voltctl.robot
index cd4604c..adca1fe 100644
--- a/libraries/voltctl.robot
+++ b/libraries/voltctl.robot
@@ -41,7 +41,7 @@
     Should Be Equal As Integers    ${rc}    0
 
 Validate Device
-    [Arguments]    ${serial_number}    ${admin_state}    ${oper_status}    ${connect_status}    ${onu_reason}    ${onu}=False
+    [Arguments]    ${serial_number}    ${admin_state}    ${oper_status}    ${connect_status}    ${onu_reason}=${EMPTY}    ${onu}=False
     [Documentation]    Parses the output of "voltctl device list" and inspects device ${serial_number}
     ...    Arguments are matched for device states of: "admin_state", "oper_status", and "connect_status"
     ${output}=    Run    ${VOLTCTL_CONFIG}; voltctl device list -o json