[VOL-3138] Leveraging enableLldp flag to count OLT NNI flows
Change-Id: Iff0f037e3389678260d2f0f3c3d03719d246eea7
diff --git a/tests/scale/Voltha_Scale_Tests.robot b/tests/scale/Voltha_Scale_Tests.robot
index 76708ea..328de27 100644
--- a/tests/scale/Voltha_Scale_Tests.robot
+++ b/tests/scale/Voltha_Scale_Tests.robot
@@ -62,7 +62,6 @@
${pon} 1
${onu} 1
-${enableLLDP} false
${enableFlowProvisioning} true
${enableSubscriberProvisioning} true
@@ -70,6 +69,8 @@
${withEapol} false
${withDhcp} false
${withIgmp} false
+# as of now the LLDP flow is always installed
+${withLLDP} true
# Per-test logging on failure is turned off by default; set this variable to enable
${container_log_dir} ${None}
@@ -78,7 +79,7 @@
Create and Enable devices
[Documentation] Create and enable the OLTs in VOLTHA
- [Tags] setup
+ [Tags] non-critical setup
${olt_device_ids}= Create List
FOR ${INDEX} IN RANGE 0 ${olt}
${olt_device_id}= Create Device bbsim${INDEX} 50060 openolt
@@ -104,14 +105,14 @@
# NOTE fail the test immediately if we're trying to check flows without provisioning them
Should Be Equal ${enableFlowProvisioning} true
Wait for Logical Devices flows ${workflow} ${total_onus} ${olt} false
- ... ${withEapol} ${withDhcp} ${withIgmp}
+ ... ${withEapol} ${withDhcp} ${withIgmp} ${withLLDP}
Flows validation in VOLTHA Adapters before subscriber provisioning
[Documentation] Check that all flows has been store in devices of type openolt
[Tags] non-critical flow-before plot-voltha-openolt-flows-before
Should Be Equal ${enableFlowProvisioning} true
Wait for OpenOLT Devices flows ${workflow} ${total_onus} ${olt} false
- ... ${withEapol} ${withDhcp} ${withIgmp}
+ ... ${withEapol} ${withDhcp} ${withIgmp} ${withLLDP}
Flows validation in ONOS before subscriber provisioning
[Documentation] Check that all the flows has been acknowledged
@@ -119,7 +120,8 @@
# NOTE fail the test immediately if we're trying to check flows without provisioning them
Should Be Equal ${enableFlowProvisioning} true
Wait for all flows to in ADDED state ${ONOS_SSH_IP} ${ONOS_SSH_PORT}
- ... ${workflow} ${total_onus} ${olt} false ${withEapol} ${withDhcp} ${withIgmp}
+ ... ${workflow} ${total_onus} ${olt} false ${withEapol} ${withDhcp}
+ ... ${withIgmp} ${withLLDP}
Wait for subscribers to be Authenticated
[Documentation] Check that all subscribers have successfully authenticated
@@ -141,14 +143,14 @@
# NOTE fail the test immediately if we're trying to check flows without provisioning them
Should Be Equal ${enableFlowProvisioning} true
Wait for Logical Devices flows ${workflow} ${total_onus} ${olt} true
- ... ${withEapol} ${withDhcp} ${withIgmp}
+ ... ${withEapol} ${withDhcp} ${withIgmp} ${withLLDP}
Flows validation in VOLTHA Adapters after subscriber provisioning
[Documentation] Check that all flows has been store in devices of type openolt
[Tags] non-critical flow-after plot-voltha-openolt-flows-after
Should Be Equal ${enableFlowProvisioning} true
Wait for OpenOLT Devices flows ${workflow} ${total_onus} ${olt} true
- ... ${withEapol} ${withDhcp} ${withIgmp}
+ ... ${withEapol} ${withDhcp} ${withIgmp} ${withLLDP}
Flows validation in ONOS after subscriber provisioning
[Documentation] Check that all the flows has been acknowledged
@@ -156,7 +158,8 @@
# NOTE fail the test immediately if we're trying to check flows without provisioning them
Should Be Equal ${enableFlowProvisioning} true
Wait for all flows to in ADDED state ${ONOS_SSH_IP} ${ONOS_SSH_PORT}
- ... ${workflow} ${total_onus} ${olt} true ${withEapol} ${withDhcp} ${withIgmp}
+ ... ${workflow} ${total_onus} ${olt} true ${withEapol} ${withDhcp}
+ ... ${withIgmp} ${withLLDP}
Wait for subscribers to have an IP
[Documentation] Check that all subscribers have received a DHCP_ACK