[VOL-3615] Updates to ONOS HA and Error scenarios for multi-OLT framework
Change-Id: I482f3bfeaa77909f8bf374246c1260f43ce9aba4
diff --git a/tests/functional/Voltha_AlarmTests.robot b/tests/functional/Voltha_AlarmTests.robot
index 291b214..ffa7d08 100755
--- a/tests/functional/Voltha_AlarmTests.robot
+++ b/tests/functional/Voltha_AlarmTests.robot
@@ -381,7 +381,7 @@
... kills processes and cleans up interfaces on src+dst servers
Get ONOS Status ${ONOS_SSH_IP} ${ONOS_SSH_PORT}
Run Keyword If ${has_dataplane} Clean Up Linux
- Run Keyword If ${teardown_device} Delete Device and Verify
+ Run Keyword If ${teardown_device} Delete All Devices and Verify
Run Keyword If ${teardown_device} Test Empty Device List
Run Keyword If ${teardown_device} Execute ONOS CLI Command ${ONOS_SSH_IP} ${ONOS_SSH_PORT}
... device-remove ${of_id}
diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index c26ad94..d317236 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -244,7 +244,7 @@
Set Suite Variable ${olt_device_id}
#validate olt states
Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Device PREPROVISIONED UNKNOWN
- ... UNKOWN ${olt_device_id}
+ ... UNKNOWN ${olt_device_id}
#Enable the created OLT device
Enable Device ${olt_device_id}
Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Device ENABLED ACTIVE
diff --git a/tests/functional/Voltha_ONOSHATests.robot b/tests/functional/Voltha_ONOSHATests.robot
index 1ba78af..5aabf72 100644
--- a/tests/functional/Voltha_ONOSHATests.robot
+++ b/tests/functional/Voltha_ONOSHATests.robot
@@ -73,13 +73,20 @@
Run Keyword If ${has_dataplane} Clean Up Linux
Run Keyword If '${workflow}' == 'ATT' Wait Until Keyword Succeeds ${timeout} 2s Perform Sanity Test
Run Keyword If '${workflow}' == 'DT' Wait Until Keyword Succeeds ${timeout} 2s Perform Sanity Test DT
- ${of_id}= Wait Until Keyword Succeeds 360s 15s Validate OLT Device in ONOS ${olt_serial_number}
- ${node_id}= Wait Until Keyword Succeeds 20s 5s Get Master Instace in ONOS ${of_id}
- ${podName} Set Variable ${node_id}
- Wait Until Keyword Succeeds ${timeout} 15s Delete K8s Pods By Name ${NAMESPACE} ${podName}
- Sleep 60s
- Wait Until Keyword Succeeds ${timeout} 2s Validate Pods Status By Name ${NAMESPACE}
- ... ${podName} Running
+ FOR ${I} IN RANGE 0 ${olt_count}
+ ${olt_user}= Get From Dictionary ${list_olts}[${I}] user
+ ${olt_pass}= Get From Dictionary ${list_olts}[${I}] pass
+ ${olt_ssh_ip}= Get From Dictionary ${list_olts}[${I}] sship
+ ${olt_serial_number}= Get From Dictionary ${list_olts}[${I}] sn
+ ${olt_device_id}= Get OLTDeviceID From OLT List ${olt_serial_number}
+ ${of_id}= Wait Until Keyword Succeeds 360s 15s Validate OLT Device in ONOS ${olt_serial_number}
+ ${node_id}= Wait Until Keyword Succeeds 20s 5s Get Master Instace in ONOS ${of_id}
+ ${podName} Set Variable ${node_id}
+ Wait Until Keyword Succeeds ${timeout} 15s Delete K8s Pods By Name ${NAMESPACE} ${podName}
+ Sleep 60s
+ Wait Until Keyword Succeeds ${timeout} 2s Validate Pods Status By Name ${NAMESPACE}
+ ... ${podName} Running
+ END
# Performing Sanity Test to make sure subscribers are all AUTH+DHCP and pingable
Run Keyword If ${has_dataplane} Clean Up Linux
Run Keyword If '${workflow}' == 'ATT' Wait Until Keyword Succeeds ${timeout} 2s Perform Sanity Test