optimize keyword Wait for ONU Adapter Reconcile
Keyword 'Wait for Onu Adapter Reconcile' was removed and new keyword
'Reconcile Onu Adapter' was introduced instead. New keyword does all
needed actions for reconcilation:
- reboot onu-adapter
- check onu-adapter was really rebooted by ready timestamp comparison
- validate connection rw-core <-> onu-adapter established
- check accessability of onu-adapter
- validate oper-state is same as before reconcile
Change-Id: Ib9e97f2e3662ef34fd658e89270e35ba44f3ee01
diff --git a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
index 678365d..11bfdb1 100755
--- a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
@@ -263,9 +263,7 @@
Enable Device ${olt_device_id}
END
Current State Test All Onus ${expected_onu_reason}
- Run Keyword If ${usekill2restart} Kill And Check Onu Adaptor ${NAMESPACE}
- ... ELSE Restart And Check Onu Adaptor ${NAMESPACE}
- Wait for ONU Adapter Reconcile ACTIVE
+ Reconcile Onu Adapter ${NAMESPACE} ${usekill2restart} ACTIVE
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT
... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT
... ELSE Perform Sanity Test
@@ -299,9 +297,7 @@
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}
- Run Keyword If ${usekill2restart} Kill And Check Onu Adaptor ${NAMESPACE}
- ... ELSE Restart And Check Onu Adaptor ${NAMESPACE}
- Wait for ONU Adapter Reconcile UNKNOWN
+ 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}
@@ -334,9 +330,7 @@
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT
... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT
... ELSE Perform Sanity Test
- Run Keyword If ${usekill2restart} Kill And Check Onu Adaptor ${NAMESPACE}
- ... ELSE Restart And Check Onu Adaptor ${NAMESPACE}
- Wait for ONU Adapter Reconcile ACTIVE
+ Reconcile Onu Adapter ${NAMESPACE} ${usekill2restart} ACTIVE
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT ${suppressaddsubscriber}
... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT ${suppressaddsubscriber}
... ELSE Perform Sanity Test ${suppressaddsubscriber}