Fix flow handling disabled device for TT and ATT
Change-Id: I584591aeefdfced1c1e814079978c06a92516968
diff --git a/tests/openonu-go-adapter/Voltha_ONUMibAudit.robot b/tests/openonu-go-adapter/Voltha_ONUMibAudit.robot
index c68a0c0..b9d7186 100755
--- a/tests/openonu-go-adapter/Voltha_ONUMibAudit.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUMibAudit.robot
@@ -116,10 +116,9 @@
... ELSE Perform Sanity Test ${suppressaddsubscriber}
Run Keyword If ${print2console} Log Disable ONUs. console=yes
Disable Onu Device
- ${alternativeonustates}= Create List omci-flows-deleted
Run Keyword If "${workflow}"=="DT" Current State Test All Onus omci-admin-lock
- ... ELSE IF "${workflow}"=="TT" Current State Test All Onus omci-admin-lock
- ... ELSE Current State Test All Onus omci-admin-lock alternativeonustate=${alternativeonustates}
+ ... ELSE IF "${workflow}"=="TT" Current State Test All Onus tech-profile-config-delete-success
+ ... ELSE Current State Test All Onus tech-profile-config-delete-success
#check all ports are disabled in ONOS
Wait for all ONU Ports in ONOS Disabled ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${unitag_sub}
Run Keyword If ${print2console} Log Enable ONUs. console=yes
diff --git a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
index 0892abc..b1ac953 100755
--- a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
@@ -378,25 +378,26 @@
... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT
... ELSE Perform Sanity Test
Disable Onu Device
- ${alternativeonustates}= Create List omci-flows-deleted
Run Keyword If "${workflow}"=="DT" Current State Test All Onus omci-admin-lock
- ... ELSE IF "${workflow}"=="TT" Current State Test All Onus omci-admin-lock
- ... ELSE Current State Test All Onus omci-admin-lock alternativeonustate=${alternativeonustates}
+ ... ELSE IF "${workflow}"=="TT" Current State Test All Onus tech-profile-config-delete-success
+ ... ELSE Current State Test All Onus tech-profile-config-delete-success
#check no port is enabled in ONOS
Wait for Ports in ONOS for all OLTs ${ONOS_SSH_IP} ${ONOS_SSH_PORT} 0 BBSM
Wait for all ONU Ports in ONOS Disabled ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${unitag_sub}
# validate etcd data
${List_ONU_Serial} Create List
Build ONU SN List ${List_ONU_Serial}
+ ${must_exist}= Set Variable If "${workflow}"=="DT" True False
+ ${check_empty}= Set Variable If "${workflow}"=="DT" False True
FOR ${onu_sn} IN @{List_ONU_Serial}
Wait Until Keyword Succeeds ${timeout} 2s Validate Tech Profiles and Flows in ETCD Data Per Onu
- ... ${onu_sn} ${INFRA_NAMESPACE} ${kvstoreprefix} must_exist=True check_tcont_map_empty=False
+ ... ${onu_sn} ${INFRA_NAMESPACE} ${kvstoreprefix} must_exist=${must_exist} check_tcont_map_empty=${check_empty}
... check_default_flow_att=False
END
Reconcile Onu Adapter ${NAMESPACE} ${usekill2restart} UNKNOWN
Run Keyword If "${workflow}"=="DT" Current State Test All Onus omci-admin-lock
- ... ELSE IF "${workflow}"=="TT" Current State Test All Onus omci-admin-lock
- ... ELSE Current State Test All Onus omci-admin-lock alternativeonustate=${alternativeonustates}
+ ... ELSE IF "${workflow}"=="TT" Current State Test All Onus tech-profile-config-delete-success
+ ... ELSE Current State Test All Onus tech-profile-config-delete-success
Wait for all ONU Ports in ONOS Disabled ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${unitag_sub}
Enable Onu Device
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT ${suppressaddsubscriber}
@@ -431,10 +432,9 @@
... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT ${suppressaddsubscriber}
... ELSE Perform Sanity Test ${suppressaddsubscriber}
Disable Onu Device
- ${alternativeonustates}= Create List omci-flows-deleted
Run Keyword If "${workflow}"=="DT" Current State Test All Onus omci-admin-lock
- ... ELSE IF "${workflow}"=="TT" Current State Test All Onus omci-admin-lock
- ... ELSE Current State Test All Onus omci-admin-lock alternativeonustate=${alternativeonustates}
+ ... ELSE IF "${workflow}"=="TT" Current State Test All Onus tech-profile-config-delete-success
+ ... ELSE Current State Test All Onus tech-profile-config-delete-success
Wait for all ONU Ports in ONOS Disabled ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${unitag_sub}
Enable Onu Device
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT ${suppressaddsubscriber}
@@ -621,10 +621,9 @@
... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT ${suppressaddsubscriber}
... ELSE Perform Sanity Test ${suppressaddsubscriber}
Disable Onu Device
- ${alternativeonustates}= Create List omci-flows-deleted
Run Keyword If "${workflow}"=="DT" Current State Test All Onus omci-admin-lock
- ... ELSE IF "${workflow}"=="TT" Current State Test All Onus omci-admin-lock
- ... ELSE Current State Test All Onus omci-admin-lock alternativeonustate=${alternativeonustates}
+ ... ELSE IF "${workflow}"=="TT" Current State Test All Onus tech-profile-config-delete-success
+ ... ELSE Current State Test All Onus tech-profile-config-delete-success
Wait for all ONU Ports in ONOS Disabled ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${unitag_sub}
Enable Onu Device
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT ${suppressaddsubscriber}