Missing targets for reconcile tests in multiple OLTs scenario
When reconcile tests were introduced for muliple olt scenario
it was not noticed there are no targets for. All tests are
running in a single onu mode. That means only the first onu
of the first olt was checked.
With introduction of the new targets requirements of multiple
OLT scenario will be full filled.
Change-Id: I554d9f090cc1969ed7cbfedc98fcfcd75eda4486
diff --git a/Makefile b/Makefile
index 67b89f3..4d8b409 100755
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,8 @@
ROBOT_SANITY_SINGLE_PON_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind.yaml
ROBOT_SANITY_DT_SINGLE_PON_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind-dt.yaml
ROBOT_SANITY_MULTIPLE_OLT_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
+ROBOT_SANITY_DT_MULTIPLE_OLT_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
+ROBOT_SANITY_TT_MULTIPLE_OLT_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
ROBOT_FAIL_SINGLE_PON_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind.yaml
ROBOT_SANITY_MULT_PON_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind-2x2.yaml
ROBOT_SCALE_SINGLE_PON_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind-16.yaml
@@ -135,22 +137,39 @@
mib-upload-templating-openonu-go-adapter-test: ROBOT_FILE := Voltha_ONUTemplateTests.robot
mib-upload-templating-openonu-go-adapter-test: openonu-go-adapter-tests
-# target to invoke reconcile tests with openonu go adapter at single ONU with ATT workflow
-reconcile-openonu-go-adapter-test: ROBOT_MISC_ARGS += -v workflow:ATT
+# target to invoke reconcile tests with openonu go adapter at single ONU with ATT workflow (default workflow)
reconcile-openonu-go-adapter-test: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
reconcile-openonu-go-adapter-test: reconcile-openonu-go-adapter-tests
# target to invoke reconcile tests with openonu go adapter at single ONU with DT workflow
-reconcile-openonu-go-adapter-test-dt: ROBOT_MISC_ARGS += -v workflow:DT
reconcile-openonu-go-adapter-test-dt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_DT_SINGLE_PON_FILE)
-reconcile-openonu-go-adapter-test-dt: reconcile-openonu-go-adapter-tests
+reconcile-openonu-go-adapter-test-dt: reconcile-openonu-go-adapter-tests-dt
# target to invoke reconcile tests with openonu go adapter at single ONU with TT workflow
-reconcile-openonu-go-adapter-test-tt: ROBOT_MISC_ARGS += -v workflow:TT
reconcile-openonu-go-adapter-test-tt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_TT_SINGLE_PON_FILE)
-reconcile-openonu-go-adapter-test-tt: reconcile-openonu-go-adapter-tests
+reconcile-openonu-go-adapter-test-tt: reconcile-openonu-go-adapter-tests-tt
-# target to invoke reconcile tests with openonu go adapter at single ONU
+# target to invoke reconcile tests with openonu go adapter with multiple OLTs scenario with ATT workflow (default workflow)
+reconcile-openonu-go-adapter-multi-olt-test: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULTIPLE_OLT_FILE)
+reconcile-openonu-go-adapter-multi-olt-test: reconcile-openonu-go-adapter-tests
+
+# target to invoke reconcile tests with openonu go adapter with multiple OLTs scenario with DT workflow
+reconcile-openonu-go-adapter-multi-olt-test-dt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_DT_MULTIPLE_OLT_FILE)
+reconcile-openonu-go-adapter-multi-olt-test-dt: reconcile-openonu-go-adapter-tests-dt
+
+# target to invoke reconcile tests with openonu go adapter with multiple OLTs scenario with TT workflow
+reconcile-openonu-go-adapter-multi-olt-test-tt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_TT_MULTIPLE_OLT_FILE)
+reconcile-openonu-go-adapter-multi-olt-test-tt: reconcile-openonu-go-adapter-tests-tt
+
+# target to invoke reconcile tests with openonu go adapter with DT workflow
+reconcile-openonu-go-adapter-tests-dt: ROBOT_MISC_ARGS += -v workflow:DT
+reconcile-openonu-go-adapter-tests-dt: reconcile-openonu-go-adapter-tests
+
+# target to invoke reconcile tests with openonu go adapter with TT workflow
+reconcile-openonu-go-adapter-tests-tt: ROBOT_MISC_ARGS += -v workflow:TT
+reconcile-openonu-go-adapter-tests-tt: reconcile-openonu-go-adapter-tests
+
+# target to invoke reconcile tests with openonu go adapter at single ONU resp. multiple OLTs
reconcile-openonu-go-adapter-tests: ROBOT_MISC_ARGS += -v logging:True -i functionalOnuGo
reconcile-openonu-go-adapter-tests: ROBOT_MISC_ARGS += -e notreadyOnuGo -X $(ROBOT_DEBUG_LOG_OPT)
reconcile-openonu-go-adapter-tests: ROBOT_FILE := Voltha_ONUReconcileTests.robot
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
new file mode 100755
index 0000000..03d902a
--- /dev/null
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
@@ -0,0 +1,90 @@
+---
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for kind-voltha running BBSim
+
+# Change default values in tests
+workflow: DT
+has_dataplane: false
+external_libs: false
+teardown_device: true
+ONOS_REST_PORT: 8181
+ONOS_SSH_PORT: 8101
+OLT_PORT: 50060
+
+nodes:
+ -
+ ip: '127.0.0.1'
+
+olts:
+ -
+ ip: bbsim0.voltha.svc
+ serial: BBSIM_OLT_10
+ -
+ ip: bbsim1.voltha.svc
+ serial: BBSIM_OLT_11
+
+hosts:
+ src:
+ -
+ onu: 'BBSM000a0001'
+ c_tag: '4096'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_10'
+ -
+ onu: 'BBSM000a0002'
+ c_tag: '4096'
+ s_tag: '901'
+ olt: 'BBSIM_OLT_10'
+ -
+ onu: 'BBSM000a0101'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '4096'
+ s_tag: '902'
+ -
+ onu: 'BBSM000a0102'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '4096'
+ s_tag: '903'
+ -
+ onu: 'BBSM000b0001'
+ c_tag: '4097'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_11'
+ -
+ onu: 'BBSM000b0002'
+ c_tag: '4097'
+ s_tag: '901'
+ olt: 'BBSIM_OLT_11'
+ -
+ onu: 'BBSM000b0101'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '4097'
+ s_tag: '902'
+ -
+ onu: 'BBSM000b0102'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '4097'
+ s_tag: '903'
+ dst:
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
new file mode 100755
index 0000000..fa2f210
--- /dev/null
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
@@ -0,0 +1,266 @@
+---
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for kind-voltha running BBSim
+
+# Change default values in tests
+workflow: TT
+has_dataplane: false
+external_libs: false
+teardown_device: true
+ONOS_REST_PORT: 8181
+ONOS_SSH_PORT: 8101
+OLT_PORT: 50060
+
+nodes:
+ -
+ ip: '127.0.0.1'
+
+olts:
+ -
+ ip: bbsim0.voltha.svc
+ serial: BBSIM_OLT_10
+ -
+ ip: bbsim1.voltha.svc
+ serial: BBSIM_OLT_11
+
+hosts:
+ src:
+ -
+ onu: 'BBSM000a0001'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '900'
+ s_tag: '900'
+ service_type: 'hsia'
+ -
+ onu: 'BBSM000a0001'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '444'
+ s_tag: '333'
+ service_type: 'voip'
+ -
+ onu: 'BBSM000a0001'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '55'
+ s_tag: '555'
+ service_type: 'vod'
+ -
+ onu: 'BBSM000a0001'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '55'
+ s_tag: '550'
+ service_type: 'mcast'
+ -
+ onu: 'BBSM000a0002'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '901'
+ s_tag: '900'
+ service_type: 'hsia'
+ -
+ onu: 'BBSM000a0002'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '444'
+ s_tag: '333'
+ service_type: 'voip'
+ -
+ onu: 'BBSM000a0002'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '55'
+ s_tag: '555'
+ service_type: 'vod'
+ -
+ onu: 'BBSM000a0002'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '55'
+ s_tag: '550'
+ service_type: 'mcast'
+ -
+ onu: 'BBSM000a0101'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '902'
+ s_tag: '900'
+ service_type: 'hsia'
+ -
+ onu: 'BBSM000a0101'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '444'
+ s_tag: '333'
+ service_type: 'voip'
+ -
+ onu: 'BBSM000a0101'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '55'
+ s_tag: '555'
+ service_type: 'vod'
+ -
+ onu: 'BBSM000a0101'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '55'
+ s_tag: '550'
+ service_type: 'mcast'
+ -
+ onu: 'BBSM000a0102'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '903'
+ s_tag: '900'
+ service_type: 'hsia'
+ -
+ onu: 'BBSM000a0102'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '444'
+ s_tag: '333'
+ service_type: 'voip'
+ -
+ onu: 'BBSM000a0102'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '55'
+ s_tag: '555'
+ service_type: 'vod'
+ -
+ onu: 'BBSM000a0102'
+ olt: 'BBSIM_OLT_10'
+ c_tag: '55'
+ s_tag: '550'
+ service_type: 'mcast'
+ -
+ onu: 'BBSM000b0001'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '900'
+ s_tag: '901'
+ service_type: 'hsia'
+ -
+ onu: 'BBSM000b0001'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '444'
+ s_tag: '333'
+ service_type: 'voip'
+ -
+ onu: 'BBSM000b0001'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '55'
+ s_tag: '555'
+ service_type: 'vod'
+ -
+ onu: 'BBSM000b0001'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '55'
+ s_tag: '550'
+ service_type: 'mcast'
+ -
+ onu: 'BBSM000b0002'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '901'
+ s_tag: '901'
+ service_type: 'hsia'
+ -
+ onu: 'BBSM000b0002'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '444'
+ s_tag: '333'
+ service_type: 'voip'
+ -
+ onu: 'BBSM000b0002'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '55'
+ s_tag: '555'
+ service_type: 'vod'
+ -
+ onu: 'BBSM000b0002'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '55'
+ s_tag: '550'
+ service_type: 'mcast'
+ -
+ onu: 'BBSM000b0101'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '902'
+ s_tag: '901'
+ service_type: 'hsia'
+ -
+ onu: 'BBSM000b0101'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '444'
+ s_tag: '333'
+ service_type: 'voip'
+ -
+ onu: 'BBSM000b0101'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '55'
+ s_tag: '555'
+ service_type: 'vod'
+ -
+ onu: 'BBSM000b0101'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '55'
+ s_tag: '550'
+ service_type: 'mcast'
+ -
+ onu: 'BBSM000b0102'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '903'
+ s_tag: '901'
+ service_type: 'hsia'
+ -
+ onu: 'BBSM000b0102'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '444'
+ s_tag: '333'
+ service_type: 'voip'
+ -
+ onu: 'BBSM000b0102'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '55'
+ s_tag: '555'
+ service_type: 'vod'
+ -
+ onu: 'BBSM000b0102'
+ olt: 'BBSIM_OLT_11'
+ c_tag: '55'
+ s_tag: '550'
+ service_type: 'mcast'
+ dst:
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null