[VOL-3796] OpenOnu-Go-Adapter: Create target for multiple OLT (2x2x2) environment
Change-Id: I5e1e5044c979a9d3f8af770935179cb8351e2dfe
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
index 60c9779..8e4c2f1 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
@@ -49,6 +49,16 @@
s_tag: '900'
olt: 'BBSIM_OLT_10'
-
+ onu: 'BBSM000a0101'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '902'
+ s_tag: '900'
+ -
+ onu: 'BBSM000a0102'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '903'
+ s_tag: '900'
+ -
onu: 'BBSM000b0001'
c_tag: '900'
s_tag: '901'
@@ -58,8 +68,22 @@
c_tag: '901'
s_tag: '901'
olt: 'BBSIM_OLT_11'
+ -
+ onu: 'BBSM000b0101'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '902'
+ s_tag: '901'
+ -
+ onu: 'BBSM000b0102'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '903'
+ s_tag: '901'
dst:
- ip: null
- ip: null
- ip: null
- ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
diff --git a/tests/openonu-go-adapter/Voltha_ONUStateTests.robot b/tests/openonu-go-adapter/Voltha_ONUStateTests.robot
index 9b38ccc..e3593b5 100755
--- a/tests/openonu-go-adapter/Voltha_ONUStateTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUStateTests.robot
@@ -30,6 +30,7 @@
Resource ../../libraries/utils.robot
Resource ../../libraries/k8s.robot
Resource ../../libraries/onu_utilities.robot
+Resource ../../libraries/bbsim.robot
Resource ../../variables/variables.robot
*** Variables ***
@@ -309,7 +310,7 @@
Do Onu Port Check
[Documentation] Check that all the UNI ports show up in ONOS
- Wait for Ports in ONOS for all OLTs ${onos_ssh_connection} ${num_all_onus} BBSM
+ Wait for Ports in ONOS for all OLTs ${onos_ssh_connection} ${num_all_onus} BBSM ${timeout}
Do Onu Etcd Data Check
[Documentation] Check Onu data stored in etcd
diff --git a/tests/openonu-go-adapter/Voltha_ONUTemplateTests.robot b/tests/openonu-go-adapter/Voltha_ONUTemplateTests.robot
index 1f3645a..1c5b1ac 100755
--- a/tests/openonu-go-adapter/Voltha_ONUTemplateTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUTemplateTests.robot
@@ -32,6 +32,7 @@
Resource ../../libraries/utils.robot
Resource ../../libraries/k8s.robot
Resource ../../libraries/onu_utilities.robot
+Resource ../../libraries/bbsim.robot
Resource ../../variables/variables.robot
*** Variables ***
@@ -116,8 +117,8 @@
# Start first Onu
${src}= Set Variable ${hosts.src[${0}]}
Log \r\nONU ${src['onu']}: startup with MIB upload cycle and storage of template data to etcd. console=yes
- ${result}= Exec Pod In Kube ${namespace} bbsim bbsimctl onu poweron ${src['onu']}
- Should Contain ${result} successfully msg=Can not poweron ${src['onu']} values=False
+ ${bbsim_pod}= Get Pod Name By Label ${namespace} release bbsim0
+ Power On ONU ${namespace} ${bbsim_pod} ${src['onu']}
${timeStart}= Get Current Date
${firstonustartup}= Get ONU Startup Duration ${firstonu} ${timeStart}
# check MIB Template data stored in etcd
@@ -126,8 +127,8 @@
# Start second Onu
${src}= Set Variable ${hosts.src[${1}]}
Log ONU ${src['onu']}: startup without MIB upload cycle by using of template data of etcd. console=yes
- ${result}= Exec Pod In Kube ${namespace} bbsim bbsimctl onu poweron ${src['onu']}
- Should Contain ${result} successfully msg=Can not poweron ${src['onu']} values=False
+ ${bbsim_pod}= Get Pod Name By Label ${namespace} release bbsim0
+ Power On ONU ${namespace} ${bbsim_pod} ${src['onu']}
${timeStart}= Get Current Date
${secondonustartup}= Get ONU Startup Duration ${secondonu} ${timeStart}
# compare both durations, second onu should be at least 3 times faster