[VOL-3058][VOL-3059][VOL-3615] Multi-OLT framework changes and updated ATT, DT, TT existing tests accordingly
Change-Id: Iad0a6d4fba3c2bf647b8a844413e8d16405cd121
diff --git a/tests/data/bbsim-kind-16.yaml b/tests/data/bbsim-kind-16.yaml
index 9dbd688..fabbf42 100644
--- a/tests/data/bbsim-kind-16.yaml
+++ b/tests/data/bbsim-kind-16.yaml
@@ -36,21 +36,37 @@
hosts:
src:
- onu: 'BBSM00000001'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000002'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000003'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000004'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000005'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000006'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000007'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000008'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000009'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM0000000a'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM0000000b'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM0000000c'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM0000000d'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM0000000e'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM0000000f'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000010'
+ olt: 'BBSIM_OLT_0'
dst:
- ip: null
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index 4ee3a12..4618002 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -35,15 +35,19 @@
hosts:
src:
- onu: 'BBSM00000001'
+ olt: 'BBSIM_OLT_0'
c_tag: '900'
s_tag: '900'
- onu: 'BBSM00000002'
+ olt: 'BBSIM_OLT_0'
c_tag: '901'
s_tag: '900'
- onu: 'BBSM00000101'
+ olt: 'BBSIM_OLT_0'
c_tag: '902'
s_tag: '900'
- onu: 'BBSM00000102'
+ olt: 'BBSIM_OLT_0'
c_tag: '903'
s_tag: '900'
diff --git a/tests/data/bbsim-kind-8x2.yaml b/tests/data/bbsim-kind-8x2.yaml
index 84e6a1c..cdd217c 100644
--- a/tests/data/bbsim-kind-8x2.yaml
+++ b/tests/data/bbsim-kind-8x2.yaml
@@ -36,21 +36,37 @@
hosts:
src:
- onu: 'BBSM00000001'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000002'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000101'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000102'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000201'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000202'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000301'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000302'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000401'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000402'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000501'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000502'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000601'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000602'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000701'
+ olt: 'BBSIM_OLT_0'
- onu: 'BBSM00000702'
+ olt: 'BBSIM_OLT_0'
dst:
- ip: null
diff --git a/tests/data/bbsim-kind-dt.yaml b/tests/data/bbsim-kind-dt.yaml
index 6309371..3747263 100644
--- a/tests/data/bbsim-kind-dt.yaml
+++ b/tests/data/bbsim-kind-dt.yaml
@@ -37,6 +37,7 @@
src:
-
onu: 'BBSM00000001'
+ olt: 'BBSIM_OLT_0'
c_tag: '4096'
s_tag: '900'
diff --git a/tests/data/bbsim-kind-tt.yaml b/tests/data/bbsim-kind-tt.yaml
index 9758235..7434bca 100644
--- a/tests/data/bbsim-kind-tt.yaml
+++ b/tests/data/bbsim-kind-tt.yaml
@@ -37,6 +37,7 @@
src:
-
onu: 'BBSM00000001'
+ olt: 'BBSIM_OLT_0'
c_tag: '900'
s_tag: '900'
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index d27f5bb..dae5f1f 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -36,6 +36,7 @@
src:
-
onu: 'BBSM00000001'
+ olt: 'BBSIM_OLT_0'
c_tag: '900'
s_tag: '900'
diff --git a/tests/data/multiple-bbsim-kind.yaml b/tests/data/multiple-bbsim-kind.yaml
index 30c65c2..308c22d 100755
--- a/tests/data/multiple-bbsim-kind.yaml
+++ b/tests/data/multiple-bbsim-kind.yaml
@@ -61,76 +61,58 @@
serial: BBSIM_OLT_9
hosts:
- -
- src:
- - onu: 'BBSM00000001'
- c_tag: '900'
- s_tag: '900'
- dst:
- - ip: null
- -
- src:
- - onu: 'BBSM00010001'
- c_tag: '900'
- s_tag: '900'
- dst:
- - ip: null
- -
- src:
- - onu: 'BBSM00020001'
- c_tag: '900'
- s_tag: '900'
- dst:
- - ip: null
- -
- src:
- - onu: 'BBSM00030001'
- c_tag: '900'
- s_tag: '900'
- dst:
- - ip: null
- -
- src:
- - onu: 'BBSM00040001'
- c_tag: '900'
- s_tag: '900'
- dst:
- - ip: null
- -
- src:
- - onu: 'BBSM00050001'
- c_tag: '900'
- s_tag: '900'
- dst:
- - ip: null
- -
- src:
- - onu: 'BBSM00060001'
- c_tag: '900'
- s_tag: '900'
- dst:
- - ip: null
- -
- src:
- - onu: 'BBSM00070001'
- c_tag: '900'
- s_tag: '900'
- dst:
- - ip: null
- -
- src:
- - onu: 'BBSM00080001'
- c_tag: '900'
- s_tag: '900'
- dst:
- - ip: null
- -
- src:
- - onu: 'BBSM00090001'
- c_tag: '900'
- s_tag: '900'
- dst:
- - ip: null
+ src:
+ - onu: 'BBSM00000001'
+ c_tag: '900'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_0'
+ - onu: 'BBSM00010001'
+ c_tag: '900'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_1'
+ - onu: 'BBSM00020001'
+ c_tag: '900'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_2'
+ - onu: 'BBSM00030001'
+ c_tag: '900'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_3'
+ - onu: 'BBSM00040001'
+ c_tag: '900'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_4'
+ - onu: 'BBSM00050001'
+ c_tag: '900'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_5'
+ - onu: 'BBSM00060001'
+ c_tag: '900'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_6'
+ - onu: 'BBSM00070001'
+ c_tag: '900'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_7'
+ - onu: 'BBSM00080001'
+ c_tag: '900'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_8'
+ - onu: 'BBSM00090001'
+ c_tag: '900'
+ s_tag: '900'
+ olt: 'BBSIM_OLT_9'
+ dst:
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
+ - ip: null
sadis:
file: ${CURDIR}/../../data/onos-sadis-multiple-bbsim.json