minor test fixes
Change-Id: I71184a2d6aa49ee8101e39988bb8d6fccc7a0634
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 4541bbd..7b9768b 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -85,7 +85,7 @@
Check CLI Tools Configured
[Documentation] Tests that use 'voltctl' and 'kubectl' should execute this keyword in suite setup
# check voltctl and kubectl configured
- ${voltctl_rc}= Run And Return RC ${VOLTCTL_CONFIG} voltctl
- ${kubectl_rc}= Run And Return RC ${KUBECTL_CONFIG} kubectl
+ ${voltctl_rc}= Run And Return RC ${VOLTCTL_CONFIG}; voltctl device list
+ ${kubectl_rc}= Run And Return RC ${KUBECTL_CONFIG}; kubectl get pods
Run Keyword If ${voltctl_rc} != 0 or ${kubectl_rc} != 0 FATAL ERROR
... VOLTCTL and KUBECTL not configured. Please configure before executing tests.
diff --git a/tests/sanity/sanity.robot b/tests/sanity/sanity.robot
index 72ddd9b..d74b230 100644
--- a/tests/sanity/sanity.robot
+++ b/tests/sanity/sanity.robot
@@ -40,7 +40,7 @@
Should Be Equal As Integers ${rc} 0
Set Suite Variable ${olt_device_id}
#enable device
- ${rc} ${output}= Run and Return Rc and Output ${VOLTCTL_CONFIG}; voltctl device enable ${device_id}
+ ${rc} ${output}= Run and Return Rc and Output ${VOLTCTL_CONFIG}; voltctl device enable ${olt_device_id}
Should Be Equal As Integers ${rc} 0
#validate olt states
Wait Until Keyword Succeeds 60s 5s Validate Device ${BBSIM_OLT_SN} ENABLED ACTIVE REACHABLE
@@ -57,7 +57,7 @@
Check EAPOL Flows in ONOS
[Documentation] Validates eapol flows for the onu are pushed from voltha
- [Tags] eapol
+ [Tags] eapol notready
Wait Until Keyword Succeeds ${timeout} 5s Verify Eapol Flows Added ${num_onus}
Validate ONU Authenticated in ONOS
@@ -76,14 +76,14 @@
#disable/delete onu
${rc} ${output}= Run and Return Rc and Output ${VOLTCTL_CONFIG}; voltctl device disable ${onu_device_id}
Should Be Equal As Integers ${rc} 0
- Wait Until Keyword Succeeds 60s 5s Validate Device ${BBSIM_ONU_SN} DISABLED UNKNOWN UNREACHABLE
+ Wait Until Keyword Succeeds 60s 5s Validate Device ${BBSIM_ONU_SN} DISABLED UNKNOWN REACHABLE
${rc} ${output}= Run and Return Rc and Output ${VOLTCTL_CONFIG}; voltctl device delete ${onu_device_id}
Should Be Equal As Integers ${rc} 0
Wait Until Keyword Succeeds 60s 5s Validate Device Removed ${onu_device_id}
#disable/delete olt
${rc} ${output}= Run and Return Rc and Output ${VOLTCTL_CONFIG}; voltctl device disable ${olt_device_id}
Should Be Equal As Integers ${rc} 0
- Wait Until Keyword Succeeds 60s 5s Validate Device ${BBSIM_OLT_SN} DISABLED UNKNOWN UNREACHABLE
+ Wait Until Keyword Succeeds 60s 5s Validate Device ${BBSIM_OLT_SN} DISABLED UNKNOWN REACHABLE
${rc} ${output}= Run and Return Rc and Output ${VOLTCTL_CONFIG}; voltctl device delete ${olt_device_id}
Should Be Equal As Integers ${rc} 0
Wait Until Keyword Succeeds 60s 5s Validate Device Removed ${olt_device_id}
@@ -113,8 +113,6 @@
: FOR ${INDEX} IN RANGE 0 ${length}
\ ${value}= Get From List ${jsondata['devices']} ${INDEX}
\ ${sn}= Get From Dictionary ${value} serial
- \ ${dpid}= Get From Dictionary ${value} id
- Should Be Equal As Strings ${dpid} ${BBSIM_DEVICE_ID}
Should Be Equal As Strings ${sn} ${BBSIM_OLT_SN}
Verify Eapol Flows Added