fix sanity test tt workflow
- correct service_type from MC to mcast in yaml file
- correct and improve supress_add_subscriber handling
- remove tt sanity test mcast for openonu-go-adapter reconcile tests
(tt sanity test mcast does not run with bbsim)
Change-Id: Ideedefd32ce0f40b41de8d84a4381e756b0a1d62
diff --git a/tests/data/bbsim-kind-tt.yaml b/tests/data/bbsim-kind-tt.yaml
old mode 100644
new mode 100755
index 56706cf..5e4adaf
--- a/tests/data/bbsim-kind-tt.yaml
+++ b/tests/data/bbsim-kind-tt.yaml
@@ -54,7 +54,7 @@
olt: 'BBSIM_OLT_10'
c_tag: '55'
s_tag: '550'
- service_type: 'MC'
+ service_type: 'mcast'
dst:
- ip: null
diff --git a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
index 441dc6b..9b3c80a 100755
--- a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
@@ -265,7 +265,7 @@
Run Keyword If ${usekill2restart} Kill And Check Onu Adaptor ${namespace}
... ELSE Restart And Check Onu Adaptor ${namespace}
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT
- ... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT
+ ... ELSE IF "${workflow}"=="TT" Perform Sanity Test TT
... ELSE Perform Sanity Test
Do Reconcile For Disabled Onu Device
@@ -290,7 +290,7 @@
Enable Device ${olt_device_id}
END
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT
- ... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT
+ ... ELSE IF "${workflow}"=="TT" Perform Sanity Test TT
... ELSE Perform Sanity Test
Disable Onu Device
${alternativeonustates}= Create List omci-flows-deleted
@@ -305,7 +305,7 @@
Wait for all ONU Ports in ONOS Disabled ${onos_ssh_connection}
Enable Onu Device
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT ${suppressaddsubscriber}
- ... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT ${suppressaddsubscriber}
+ ... ELSE IF "${workflow}"=="TT" Perform Sanity Test TT ${suppressaddsubscriber}
... ELSE Perform Sanity Test ${suppressaddsubscriber}
Do Reconcile In Omci-Flows-Pushed
@@ -329,12 +329,12 @@
Enable Device ${olt_device_id}
END
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT
- ... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT
+ ... ELSE IF "${workflow}"=="TT" Perform Sanity Test TT
... ELSE Perform Sanity Test
Run Keyword If ${usekill2restart} Kill And Check Onu Adaptor ${namespace}
... ELSE Restart And Check Onu Adaptor ${namespace}
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT ${suppressaddsubscriber}
- ... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT ${suppressaddsubscriber}
+ ... ELSE IF "${workflow}"=="TT" Perform Sanity Test TT ${suppressaddsubscriber}
... ELSE Perform Sanity Test ${suppressaddsubscriber}
Disable Onu Device
${alternativeonustates}= Create List omci-flows-deleted
@@ -344,5 +344,5 @@
Wait for all ONU Ports in ONOS Disabled ${onos_ssh_connection}
Enable Onu Device
Run Keyword If "${workflow}"=="DT" Perform Sanity Test DT ${suppressaddsubscriber}
- ... ELSE IF "${workflow}"=="TT" Perform Sanity Tests TT ${suppressaddsubscriber}
+ ... ELSE IF "${workflow}"=="TT" Perform Sanity Test TT ${suppressaddsubscriber}
... ELSE Perform Sanity Test ${suppressaddsubscriber}