Always load SADIS config in tests
Change-Id: I7f8927b8d9b987673eebce40cccf84078924fe32
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index 47b30cb..a1a3488 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -45,3 +45,6 @@
- ip: null
- ip: null
- ip: null
+
+sadis:
+ file: ${CURDIR}/../../data/sadis-with-tp-2x2.json
\ No newline at end of file
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index 12ab725..a913a2e 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -39,3 +39,6 @@
dst:
- ip: null
+
+sadis:
+ file: ${CURDIR}/../../data/sadis-with-tp-2x2.json
diff --git a/tests/data/sadis-notp-1.json b/tests/data/sadis-notp-1.json
deleted file mode 100644
index a82ef86..0000000
--- a/tests/data/sadis-notp-1.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "apps": {
- "org.opencord.sadis": {
- "sadis": {
- "integration": {
- "cache": {
- "enabled": false,
- "maxsize": 50,
- "ttl": "PT0m"
- }
- },
- "entries": [
- {
- "id": "BBSIMOLT000",
- "hardwareIdentifier": "00:00:0a:62:ce:e2",
- "ipAddress": ":OLT_IPADDR:",
- "nasId": "BBSIMOLT000",
- "uplinkPort": 65536
- },
- {
- "id": "BBSM00000001-1",
- "cTag": 900,
- "sTag": 900,
- "nasPortId": "PON 2/1/01/1:1.1.1"
- }
- ]
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/data/sadis-with-tp-2x2.json b/tests/data/sadis-with-tp-2x2.json
new file mode 100644
index 0000000..0c19595
--- /dev/null
+++ b/tests/data/sadis-with-tp-2x2.json
@@ -0,0 +1,82 @@
+{
+ "sadis": {
+ "integration": {
+ "cache": {
+ "enabled": false,
+ "maxsize": 50,
+ "ttl": "PT0m"
+ }
+ },
+ "entries": [
+ {
+ "id": "BBSIM_OLT_0",
+ "hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
+ "nasId": "BBSIMOLT000",
+ "uplinkPort": 65536
+ },
+ {
+ "id": "BBSM00000001-1",
+ "cTag": 900,
+ "sTag": 900,
+ "nasPortId": "BBSM00000001-1",
+ "circuitId": "BBSM00000001-1",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "BBSM00000002-1",
+ "cTag": 901,
+ "sTag": 900,
+ "nasPortId": "BBSM00000002-1",
+ "circuitId": "BBSM00000002-1",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "BBSM00000101-1",
+ "cTag": 902,
+ "sTag": 900,
+ "nasPortId": "BBSM00000101-1",
+ "circuitId": "BBSM00000101-1",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "BBSM00000102-1",
+ "cTag": 903,
+ "sTag": 900,
+ "nasPortId": "BBSM00000102-1",
+ "circuitId": "BBSM00000102-1",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ }
+ ]
+ },
+ "bandwidthprofile": {
+ "integration": {
+ "cache": {
+ "enabled": true,
+ "maxsize": 40,
+ "ttl": "PT1m"
+ }
+ },
+ "entries": [
+ {
+ "id": "Default",
+ "cir": 1000000,
+ "cbs": 1001,
+ "eir": 1002,
+ "ebs": 1003,
+ "air": 1004
+ }
+ ]
+ }
+}