Updating c/s_tags in BBSim config to accomodate multi-uni
Change-Id: I9b091c00feb131a69aecd78f09750d62c94906bb
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
index 03d902a..4c272a5 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON-dt.yaml
@@ -47,18 +47,18 @@
-
onu: 'BBSM000a0002'
c_tag: '4096'
- s_tag: '901'
+ s_tag: '904'
olt: 'BBSIM_OLT_10'
-
onu: 'BBSM000a0101'
olt: 'BBSIM_OLT_10'
c_tag: '4096'
- s_tag: '902'
+ s_tag: '908'
-
onu: 'BBSM000a0102'
olt: 'BBSIM_OLT_10'
c_tag: '4096'
- s_tag: '903'
+ s_tag: '912'
-
onu: 'BBSM000b0001'
c_tag: '4097'
@@ -67,18 +67,18 @@
-
onu: 'BBSM000b0002'
c_tag: '4097'
- s_tag: '901'
+ s_tag: '904'
olt: 'BBSIM_OLT_11'
-
onu: 'BBSM000b0101'
olt: 'BBSIM_OLT_11'
c_tag: '4097'
- s_tag: '902'
+ s_tag: '908'
-
onu: 'BBSM000b0102'
olt: 'BBSIM_OLT_11'
c_tag: '4097'
- s_tag: '903'
+ s_tag: '912'
dst:
- ip: null
- ip: null
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
index fa2f210..928da63 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
@@ -66,7 +66,7 @@
-
onu: 'BBSM000a0002'
olt: 'BBSIM_OLT_10'
- c_tag: '901'
+ c_tag: '904'
s_tag: '900'
service_type: 'hsia'
-
@@ -90,7 +90,7 @@
-
onu: 'BBSM000a0101'
olt: 'BBSIM_OLT_10'
- c_tag: '902'
+ c_tag: '908'
s_tag: '900'
service_type: 'hsia'
-
@@ -114,7 +114,7 @@
-
onu: 'BBSM000a0102'
olt: 'BBSIM_OLT_10'
- c_tag: '903'
+ c_tag: '912'
s_tag: '900'
service_type: 'hsia'
-
@@ -162,7 +162,7 @@
-
onu: 'BBSM000b0002'
olt: 'BBSIM_OLT_11'
- c_tag: '901'
+ c_tag: '904'
s_tag: '901'
service_type: 'hsia'
-
@@ -186,7 +186,7 @@
-
onu: 'BBSM000b0101'
olt: 'BBSIM_OLT_11'
- c_tag: '902'
+ c_tag: '908'
s_tag: '901'
service_type: 'hsia'
-
@@ -210,7 +210,7 @@
-
onu: 'BBSM000b0102'
olt: 'BBSIM_OLT_11'
- c_tag: '903'
+ c_tag: '912'
s_tag: '901'
service_type: 'hsia'
-
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
index 8e4c2f1..60cf061 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
@@ -45,18 +45,18 @@
olt: 'BBSIM_OLT_10'
-
onu: 'BBSM000a0002'
- c_tag: '901'
+ c_tag: '904'
s_tag: '900'
olt: 'BBSIM_OLT_10'
-
onu: 'BBSM000a0101'
olt: 'BBSIM_OLT_10'
- c_tag: '902'
+ c_tag: '908'
s_tag: '900'
-
onu: 'BBSM000a0102'
olt: 'BBSIM_OLT_10'
- c_tag: '903'
+ c_tag: '912'
s_tag: '900'
-
onu: 'BBSM000b0001'
@@ -65,18 +65,18 @@
olt: 'BBSIM_OLT_11'
-
onu: 'BBSM000b0002'
- c_tag: '901'
+ c_tag: '904'
s_tag: '901'
olt: 'BBSIM_OLT_11'
-
onu: 'BBSM000b0101'
olt: 'BBSIM_OLT_11'
- c_tag: '902'
+ c_tag: '908'
s_tag: '901'
-
onu: 'BBSM000b0102'
olt: 'BBSIM_OLT_11'
- c_tag: '903'
+ c_tag: '912'
s_tag: '901'
dst:
- ip: null
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index 18d1c85..32cdc80 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -40,15 +40,15 @@
s_tag: '900'
- onu: 'BBSM000a0002'
olt: 'BBSIM_OLT_10'
- c_tag: '901'
+ c_tag: '904'
s_tag: '900'
- onu: 'BBSM000a0101'
olt: 'BBSIM_OLT_10'
- c_tag: '902'
+ c_tag: '908'
s_tag: '900'
- onu: 'BBSM000a0102'
olt: 'BBSIM_OLT_10'
- c_tag: '903'
+ c_tag: '912'
s_tag: '900'
dst:
diff --git a/tests/data/bbsim-kind-8x8.yaml b/tests/data/bbsim-kind-8x8.yaml
index 54f004a..a5ea424 100755
--- a/tests/data/bbsim-kind-8x8.yaml
+++ b/tests/data/bbsim-kind-8x8.yaml
@@ -39,255 +39,255 @@
s_tag: '900'
olt: BBSIM_OLT_10
- onu: 'BBSM000a0002'
- c_tag: '901'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0003'
- c_tag: '902'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0004'
- c_tag: '903'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0005'
c_tag: '904'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0006'
- c_tag: '905'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0007'
- c_tag: '906'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0008'
- c_tag: '907'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0101'
+ - onu: 'BBSM000a0003'
c_tag: '908'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0102'
- c_tag: '909'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0103'
- c_tag: '910'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0104'
- c_tag: '911'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0105'
+ - onu: 'BBSM000a0004'
c_tag: '912'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0106'
- c_tag: '913'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0107'
- c_tag: '914'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0108'
- c_tag: '915'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0201'
+ - onu: 'BBSM000a0005'
c_tag: '916'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0202'
- c_tag: '917'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0203'
- c_tag: '918'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0204'
- c_tag: '919'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0205'
+ - onu: 'BBSM000a0006'
c_tag: '920'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0206'
- c_tag: '921'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0207'
- c_tag: '922'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0208'
- c_tag: '923'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0301'
+ - onu: 'BBSM000a0007'
c_tag: '924'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0302'
- c_tag: '925'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0303'
- c_tag: '926'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0304'
- c_tag: '927'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0305'
+ - onu: 'BBSM000a0008'
c_tag: '928'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0306'
- c_tag: '929'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0307'
- c_tag: '930'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0308'
- c_tag: '931'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0401'
+ - onu: 'BBSM000a0101'
c_tag: '932'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0402'
- c_tag: '933'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0403'
- c_tag: '934'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0404'
- c_tag: '935'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0405'
+ - onu: 'BBSM000a0102'
c_tag: '936'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0406'
- c_tag: '937'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0407'
- c_tag: '938'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0408'
- c_tag: '939'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0501'
+ - onu: 'BBSM000a0103'
c_tag: '940'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0502'
- c_tag: '941'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0503'
- c_tag: '942'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0504'
- c_tag: '943'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0505'
+ - onu: 'BBSM000a0104'
c_tag: '944'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0506'
- c_tag: '945'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0507'
- c_tag: '946'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0508'
- c_tag: '947'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0601'
+ - onu: 'BBSM000a0105'
c_tag: '948'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0602'
- c_tag: '949'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0603'
- c_tag: '950'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0604'
- c_tag: '951'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0605'
+ - onu: 'BBSM000a0106'
c_tag: '952'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0606'
- c_tag: '953'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0607'
- c_tag: '954'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0608'
- c_tag: '955'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0701'
+ - onu: 'BBSM000a0107'
c_tag: '956'
s_tag: '900'
olt: BBSIM_OLT_10
- - onu: 'BBSM000a0702'
- c_tag: '957'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0703'
- c_tag: '958'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0704'
- c_tag: '959'
- s_tag: '900'
- olt: BBSIM_OLT_10
- - onu: 'BBSM000a0705'
+ - onu: 'BBSM000a0108'
c_tag: '960'
s_tag: '900'
olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0201'
+ c_tag: '964'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0202'
+ c_tag: '968'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0203'
+ c_tag: '972'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0204'
+ c_tag: '976'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0205'
+ c_tag: '980'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0206'
+ c_tag: '984'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0207'
+ c_tag: '988'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0208'
+ c_tag: '992'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0301'
+ c_tag: '996'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0302'
+ c_tag: '1000'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0303'
+ c_tag: '1004'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0304'
+ c_tag: '1008'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0305'
+ c_tag: '1012'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0306'
+ c_tag: '1016'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0307'
+ c_tag: '1020'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0308'
+ c_tag: '1024'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0401'
+ c_tag: '1028'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0402'
+ c_tag: '1032'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0403'
+ c_tag: '1036'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0404'
+ c_tag: '1040'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0405'
+ c_tag: '1044'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0406'
+ c_tag: '1048'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0407'
+ c_tag: '1052'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0408'
+ c_tag: '1056'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0501'
+ c_tag: '1060'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0502'
+ c_tag: '1064'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0503'
+ c_tag: '1068'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0504'
+ c_tag: '1072'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0505'
+ c_tag: '1076'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0506'
+ c_tag: '1080'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0507'
+ c_tag: '1084'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0508'
+ c_tag: '1088'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0601'
+ c_tag: '1092'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0602'
+ c_tag: '1096'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0603'
+ c_tag: '1100'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0604'
+ c_tag: '1104'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0605'
+ c_tag: '1108'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0606'
+ c_tag: '1112'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0607'
+ c_tag: '1116'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0608'
+ c_tag: '1120'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0701'
+ c_tag: '1124'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0702'
+ c_tag: '1128'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0703'
+ c_tag: '1132'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0704'
+ c_tag: '1136'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
+ - onu: 'BBSM000a0705'
+ c_tag: '1140'
+ s_tag: '900'
+ olt: BBSIM_OLT_10
- onu: 'BBSM000a0706'
- c_tag: '961'
+ c_tag: '1144'
s_tag: '900'
olt: BBSIM_OLT_10
- onu: 'BBSM000a0707'
- c_tag: '962'
+ c_tag: '1148'
s_tag: '900'
olt: BBSIM_OLT_10
- onu: 'BBSM000a0708'
- c_tag: '963'
+ c_tag: '1152'
s_tag: '900'
olt: BBSIM_OLT_10
dst: