reverting ofPodAgent Changes
Change-Id: I06edcfdb793415ef0be66649b75c4506301abfa5
Signed-off-by: gst <guruprasanna.st@radisys.com>
diff --git a/tests/dt-workflow/Voltha_DT_PODTests_VGC.robot b/tests/dt-workflow/Voltha_DT_PODTests_VGC.robot
index 019f423..9923717 100755
--- a/tests/dt-workflow/Voltha_DT_PODTests_VGC.robot
+++ b/tests/dt-workflow/Voltha_DT_PODTests_VGC.robot
@@ -18,7 +18,7 @@
Suite Setup Setup Suite
Test Setup Setup
Test Teardown Teardown
-Suite Teardown Setup Teardown
+Suite Teardown Teardown Suite
Library Collections
Library String
Library OperatingSystem
@@ -84,8 +84,7 @@
... should reach the NNI port on the OLT with the expected double tagged vlan ids
... Inner vlans from the RG should not change
[Tags] sanityDt soak
- [Setup] Run Keywords Start Logging SanityTestDt
- ... AND Verify Ofagent Pod Availablity
+ [Setup] Start Logging SanityTestDt
# [Teardown] Run Keywords Run Keyword If ${logging} Collect Logs
# ... AND Stop Logging SanityTestDt
Setup ${SOAK_TEST}
@@ -101,7 +100,6 @@
[Tags] functionalDt SubAddDeleteDt soak
[Setup] Run Keywords Start Logging SubAddDeleteDt
... AND Run Keyword If ${has_dataplane} Set Non-Critical Tag for XGSPON Tech
- ... AND Verify Ofagent Pod Availablity
[Teardown] Run Keywords Run Keyword If ${logging} Collect Logs
... AND Stop Logging SubAddDeleteDt
FOR ${I} IN RANGE 0 ${num_all_onus}
@@ -171,7 +169,6 @@
[Tags] functionalDt DisableEnableONUDt soak
[Setup] Run Keywords Start Logging DisableEnableONUDt
... AND Run Keyword If ${has_dataplane} Set Non-Critical Tag for XGSPON Tech
- ... AND Verify Ofagent Pod Availablity
[Teardown] Run Keywords Run Keyword If ${logging} Collect Logs
... AND Stop Logging DisableEnableONUDt
FOR ${I} IN RANGE 0 ${num_all_onus}
@@ -215,7 +212,6 @@
... Perform delete on the OLT, Re-do Setup (Recreate the OLT) and Perform Sanity Test DT
[Tags] functionalDt DisableDeleteOLTDt soak
[Setup] Start Logging DisableDeleteOLTDt
- ... AND Verify Ofagent Pod Availablity
[Teardown] Run Keywords Run Keyword If ${logging} Collect Logs
... AND Stop Logging DisableDeleteOLTDt
# Disable and Validate OLT Device
@@ -272,7 +268,6 @@
... Perform enable on the OLT and validate that the pings are successful
[Tags] functionalDt DisableEnableOLTDt soak
[Setup] Start Logging DisableEnableOLTDt
- ... AND Verify Ofagent Pod Availablity
[Teardown] Run Keywords Run Keyword If ${logging} Collect Logs
... AND Stop Logging DisableEnableOLTDt
# Disable and Validate OLT Device
@@ -331,7 +326,6 @@
... Validate DHCP/E2E pings succeed for all the ONUs connected to the OLT
[Tags] functionalDt DeleteReAddOLTDt soak
[Setup] Start Logging DeleteReAddOLTDt
- ... AND Verify Ofagent Pod Availablity
[Teardown] Run Keywords Run Keyword If ${logging} Collect Logs
... AND Stop Logging DeleteReAddOLTDt
FOR ${I} IN RANGE 0 ${olt_count}
@@ -354,7 +348,6 @@
[Tags] functionalDt DisableDeleteONUOLTDt
[Setup] Run Keywords Start Logging DisableDeleteONUOLTDt
... AND Run Keyword If ${has_dataplane} Set Non-Critical Tag for XGSPON Tech
- ... AND Verify Ofagent Pod Availablity
[Teardown] Run Keywords Run Keyword If ${logging} Collect Logs
... AND Stop Logging DisableDeleteONUOLTDt
@{onu_reason}= Create List initial-mib-downloaded omci-flows-pushed
@@ -421,7 +414,6 @@
[Tags] functionalDt DisableEnableOltPonPortDt VOL-2577 soak
[Setup] Run Keywords Start Logging DisableEnableOltPonPortDt
... AND Run Keyword If ${has_dataplane} Set Non-Critical Tag for XGSPON Tech
- ... AND Verify Ofagent Pod Availablity
[Teardown] Run Keywords Run Keyword If ${logging} Collect Logs
... AND Stop Logging DisableEnableOltPonPortDt
FOR ${I} IN RANGE 0 ${olt_count}
@@ -433,7 +425,6 @@
[Documentation] Tests the voltctl delete and Auto-Discovery of the ONU
[Tags] functionalDt VOL-3098 ONUAutoDiscoveryDt
[Setup] Start Logging ONUAutoDiscoveryDt
- ... AND Verify Ofagent Pod Availablity
[Teardown] Run Keywords Run Keyword If ${logging} Collect Logs
... AND Stop Logging ONUAutoDiscoveryDt
Clear All Devices Then Create New Device
@@ -502,14 +493,6 @@
#power_switch.robot needs it to support different vendor's power switch
${switch_type}= Get Variable Value ${web_power_switch.type}
Run Keyword If "${switch_type}"!="" Set Global Variable ${powerswitch_type} ${switch_type}
- Scale Down Ofagent Pod
-
-Setup Teardown
- Scale K8s Deployment by Pod Label ${NAMESPACE} app ${OFAGENT_POD} 1
- Wait Until Keyword Succeeds ${timeout} 2s Pods Do Not Exist By Label ${NAMESPACE} app
- ... ${OFAGENT_POD}
- Sleep 10s
- Teardown Suite
Clear All Devices Then Create New Device
[Documentation] Remove any devices from VOLTHA and VGC
@@ -518,12 +501,3 @@
# Execute normal test Setup Keyword
Setup
-Scale Down Ofagent Pod
- Scale K8s Deployment by Pod Label ${NAMESPACE} app ${OFAGENT_POD} 0
- Wait Until Keyword Succeeds ${timeout} 2s Pods Do Not Exist By Label ${NAMESPACE} app
- ... ${OFAGENT_POD}
- Sleep 10s
-
-Verify Ofagent Pod Availablity
- ${output}= Pods Do Not Exist By Label ${NAMESPACE} app ${OFAGENT_POD}
- Run Keyword If "${output}"!="True" Scale Down Ofagent Pod
diff --git a/variables/variables.robot b/variables/variables.robot
index 4fc7245..d74f07b 100644
--- a/variables/variables.robot
+++ b/variables/variables.robot
@@ -22,4 +22,3 @@
@{PODLIST2} bbsim etcd-operator-etcd-operator-etcd-operator radius voltha-api-server
... voltha-cli-server voltha-ro-core voltha-rw-core-11
${OLT_ADAPTER_APP_LABEL} adapter-open-olt
-${OFAGENT_POD} voltha-ofagent