Fix scale and alarm tests
Change-Id: I63888ef2b2ade254faa38704c43b789b6d785157
diff --git a/Makefile b/Makefile
index 45c174d..ee7e142 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@
bbsim-alarms-kind: ROBOT_MISC_ARGS += -X -i active
bbsim-alarms-kind: ROBOT_FILE := Voltha_AlarmTests.robot
-bbsim-alarms-kind: ROBOT_CONFIG_FILE := $(ROBOT_SCALE_SINGLE_PON_FILE)
+bbsim-alarms-kind: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
bbsim-alarms-kind: voltctl-docker-image-build voltctl-docker-image-install-kind voltha-test
voltha-test: ROBOT_MISC_ARGS += -e notready
@@ -131,7 +131,7 @@
vst_venv:
virtualenv -p python3 $@ ;\
source ./$@/bin/activate ;\
- python3 ./$@/bin/pip install -r requirements.txt
+ python -m pip install -r requirements.txt
test: lint
diff --git a/tests/functional/Voltha_ScaleFunctionalTests.robot b/tests/functional/Voltha_ScaleFunctionalTests.robot
index b9c6715..4c79738 100644
--- a/tests/functional/Voltha_ScaleFunctionalTests.robot
+++ b/tests/functional/Voltha_ScaleFunctionalTests.robot
@@ -31,7 +31,7 @@
*** Variables ***
${timeout} 60s
-${long_timeout} 420
+${long_timeout} 420
${of_id} 0
${logical_id} 0
${has_dataplane} True
@@ -50,11 +50,11 @@
Set Global Variable ${olt_device_id}
#validate olt states
Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Device PREPROVISIONED UNKNOWN UNKNOWN
- ... ${EMPTY} ${olt_device_id}
+ ... ${olt_device_id}
#enable device
Enable Device ${olt_device_id}
#validate olt states
- Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Device ENABLED ACTIVE REACHABLE ${EMPTY}
+ Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Device ENABLED ACTIVE REACHABLE
... ${olt_device_id}
ONU Discovery
@@ -75,7 +75,8 @@
${List_ONU_Serial} Create List
Set Suite Variable ${List_ONU_Serial}
Build ONU SN List ${List_ONU_Serial}
- Wait Until Keyword Succeeds ${long_timeout} 60s Verify Number of AAA-Users ${ONOS_SSH_IP} ${ONOS_SSH_PORT} 16
+ Wait Until Keyword Succeeds ${long_timeout} 60s Verify Number of AAA-Users ${ONOS_SSH_IP}
+ ... ${ONOS_SSH_PORT} 16
Validate Device's Ports and Flows
[Documentation] Verify Ports and Flows listed for OLT and ONUs
@@ -97,7 +98,8 @@
... For 16 ONUs we validate the number of flows to be 16 eapol flows
[Tags] VOL-1823 active
#verify eapol flows added
- Wait Until Keyword Succeeds ${long_timeout} 5s Verify Eapol Flows Added ${kONOS_SSH_IP} ${ONOS_SSH_PORT} 16
+ Wait Until Keyword Succeeds ${long_timeout} 5s Verify Eapol Flows Added ${ONOS_SSH_IP}
+ ... ${ONOS_SSH_PORT} 16
Allocate DHCP To All ONU Devices
[Documentation] DHCP Allocation for all ONUs
@@ -107,11 +109,12 @@
FOR ${I} IN RANGE 0 ${num_onus}
${src}= Set Variable ${hosts.src[${I}]}
${dst}= Set Variable ${hosts.dst[${I}]}
- ${onu_device_id}= Get Device ID From SN ${src['onu']}
- ${onu_port}= Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 2s
- ... Get ONU Port in ONOS ${src['onu']} ${of_id}
+ ${onu_device_id}= Get Device ID From SN ${src['onu']}
+ ${onu_port}= Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 2s
+ ... Get ONU Port in ONOS ${src['onu']} ${of_id}
Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 2
- ... Execute ONOS CLI Command ${ONOS_SSH_IP} ${ONOS_SSH_PORT} volt-add-subscriber-access ${of_id} ${onu_port}
+ ... Execute ONOS CLI Command ${ONOS_SSH_IP} ${ONOS_SSH_PORT}
+ ... volt-add-subscriber-access ${of_id} ${onu_port}
END
Validate Total Number Of DHCP Allocations
@@ -119,16 +122,16 @@
[Tags] VOL-1824 active
#validate total number of DHCP allocations
Wait Until Keyword Succeeds ${long_timeout} 20s Validate DHCP Allocations ${ONOS_SSH_IP}
- ... ${ONOS_SSH_PORT} 16
+ ... ${ONOS_SSH_PORT} 16
#validate DHCP allocation for each port
FOR ${I} IN RANGE 0 ${num_onus}
${src}= Set Variable ${hosts.src[${I}]}
${dst}= Set Variable ${hosts.dst[${I}]}
${onu_device_id}= Get Device ID From SN ${src['onu']}
- ${onu_port}= Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 2s
- ... Get ONU Port in ONOS ${src['onu']} ${of_id}
- Wait Until Keyword Succeeds ${long_timeout} 20s Validate Subscriber DHCP Allocation ${ONOS_SSH_IP}
- ... ${ONOS_SSH_PORT} ${onu_port}
+ ${onu_port}= Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 2s
+ ... Get ONU Port in ONOS ${src['onu']} ${of_id}
+ Wait Until Keyword Succeeds ${long_timeout} 20s Validate Subscriber DHCP Allocation ${ONOS_SSH_IP}
+ ... ${ONOS_SSH_PORT} ${onu_port}
END
Validate Logical Device