VOL-2227 Update NNI port to 1048576
Change-Id: Ib0bf9f49afafdda741c76d4945ecf8c6512bca68
diff --git a/tests/data/bbsim-kind-16.yaml b/tests/data/bbsim-kind-16.yaml
index 165d7b6..12fdb1a 100644
--- a/tests/data/bbsim-kind-16.yaml
+++ b/tests/data/bbsim-kind-16.yaml
@@ -72,4 +72,4 @@
- ip: null
sadis:
- file: ${CURDIR}/../../data/sadis-with-tp-16.json
\ No newline at end of file
+ file: ${CURDIR}/../../data/sadis-with-tp-16.json
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index a1a3488..5511dcf 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -47,4 +47,4 @@
- ip: null
sadis:
- file: ${CURDIR}/../../data/sadis-with-tp-2x2.json
\ No newline at end of file
+ file: ${CURDIR}/../../data/sadis-with-tp-8x2.json
\ No newline at end of file
diff --git a/tests/data/bbsim-kind-8x2.yaml b/tests/data/bbsim-kind-8x2.yaml
index b305f47..246f755 100644
--- a/tests/data/bbsim-kind-8x2.yaml
+++ b/tests/data/bbsim-kind-8x2.yaml
@@ -72,4 +72,4 @@
- ip: null
sadis:
- file: ${CURDIR}/../../data/sadis-with-tp-8x2.json
\ No newline at end of file
+ file: ${CURDIR}/../../data/sadis-with-tp-8x2.json
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index a913a2e..4ad775c 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -41,4 +41,4 @@
- ip: null
sadis:
- file: ${CURDIR}/../../data/sadis-with-tp-2x2.json
+ file: ${CURDIR}/../../data/sadis-with-tp-16.json
diff --git a/tests/data/flex-ocp-cord-sadis.json b/tests/data/flex-ocp-cord-sadis.json
index 8e32e28..b74e3d3 100644
--- a/tests/data/flex-ocp-cord-sadis.json
+++ b/tests/data/flex-ocp-cord-sadis.json
@@ -143,7 +143,7 @@
"hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
"ipAddress": "10.192.20.206",
"nasId": "EC1838000853",
- "uplinkPort": 65536
+ "uplinkPort": 1048576
}
]
},
diff --git a/tests/data/onf-demo-pod-sadis.json b/tests/data/onf-demo-pod-sadis.json
index 426ef24..c7081da 100644
--- a/tests/data/onf-demo-pod-sadis.json
+++ b/tests/data/onf-demo-pod-sadis.json
@@ -55,7 +55,7 @@
"hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
"ipAddress": "10.192.20.206",
"nasId": "EC1904000654",
- "uplinkPort": 65536
+ "uplinkPort": 1048576
}
]
},
diff --git a/tests/data/onlab-pod1-sadis.json b/tests/data/onlab-pod1-sadis.json
index 64d9f90..cb4b9ec 100644
--- a/tests/data/onlab-pod1-sadis.json
+++ b/tests/data/onlab-pod1-sadis.json
@@ -77,7 +77,7 @@
"hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
"ipAddress": "10.192.20.206",
"nasId": "EC1838000853",
- "uplinkPort": 65536
+ "uplinkPort": 1048576
}
]
},
diff --git a/tests/data/sadis-with-tp-16.json b/tests/data/sadis-with-tp-16.json
index d667854..c40db86 100755
--- a/tests/data/sadis-with-tp-16.json
+++ b/tests/data/sadis-with-tp-16.json
@@ -14,7 +14,7 @@
"hardwareIdentifier": "00:00:0a:62:ce:e2",
"ipAddress": "192.168.1.252",
"nasId": "BBSIM_OLT_0",
- "uplinkPort": 65536
+ "uplinkPort": 1048576
},
{
"id": "BBSM00000001-1",
diff --git a/tests/data/sadis-with-tp-2x2.json b/tests/data/sadis-with-tp-2x2.json
deleted file mode 100644
index 0c19595..0000000
--- a/tests/data/sadis-with-tp-2x2.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "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
- }
- ]
- }
-}
diff --git a/tests/data/sadis-with-tp-8x2.json b/tests/data/sadis-with-tp-8x2.json
index b28b53e..1bc90eb 100755
--- a/tests/data/sadis-with-tp-8x2.json
+++ b/tests/data/sadis-with-tp-8x2.json
@@ -14,7 +14,7 @@
"hardwareIdentifier": "00:00:0a:62:ce:e2",
"ipAddress": "192.168.1.252",
"nasId": "BBSIM_OLT_0",
- "uplinkPort": 65536
+ "uplinkPort": 1048576
},
{
"id": "BBSM00000001-1",
diff --git a/tests/data/tucson-pod-sadis.json b/tests/data/tucson-pod-sadis.json
index c3fd0d7..4e61037 100644
--- a/tests/data/tucson-pod-sadis.json
+++ b/tests/data/tucson-pod-sadis.json
@@ -14,7 +14,7 @@
"id": "EC1925000157",
"hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
"nasId": "EC1925000157",
- "uplinkPort": 65536
+ "uplinkPort": 1048576
},
{
"id": "ALPHe3d1ce7b-1",