ONOS-7451 Update sample files to TAPI >= 2.0.2
tapi-connectivity@2018-03-07.yang
Change-Id: I418803922d6432de158eb0a9beaa6cb4d06fc2dc
diff --git a/apps/odtn/src/test/resources/create-connectivity.json b/apps/odtn/src/test/resources/create-connectivity.json
index ce3cf20..283de56 100644
--- a/apps/odtn/src/test/resources/create-connectivity.json
+++ b/apps/odtn/src/test/resources/create-connectivity.json
@@ -3,8 +3,10 @@
{
"end-point" : [
{
- "layer-protocol-name" : "OTSiA",
- "service-interface-point": "00000000-0000-4200-0001-110000000000",
+ "layer-protocol-name" : "DSR",
+ "service-interface-point": {
+ "service-interface-point-id" : "00000000-0000-4200-0001-110000000000"
+ },
"capacity" : {
},
"direction" : "BIDIRECTIONAL",
@@ -13,8 +15,20 @@
"local-id": "00000000-0000-4100-0001-110000000000",
"name" : [
{
- "value-name" : "main",
- "value" : "sep11"
+ "value-name" : "port",
+ "value" : "1"
+ },
+ {
+ "value-name" : "transponder",
+ "value" : "TRNP_A"
+ },
+ {
+ "value-name" : "onos-index",
+ "value" : "1"
+ },
+ {
+ "value-name" : "test-driver",
+ "value" : "driver"
}
],
"administrative-state" : "UNLOCKED",
@@ -23,8 +37,10 @@
}
,
{
- "layer-protocol-name" : "OTSiA",
- "service-interface-point": "00000000-0000-4200-0001-210000000000",
+ "layer-protocol-name" : "DSR",
+ "service-interface-point": {
+ "service-interface-point-id" : "00000000-0000-4200-0001-210000000000"
+ },
"capacity" : {
},
"direction" : "BIDIRECTIONAL",
@@ -33,8 +49,20 @@
"local-id": "00000000-0000-4100-0001-210000000000",
"name" : [
{
- "value-name" : "main",
- "value" : "sep21"
+ "value-name" : "port",
+ "value" : "1"
+ },
+ {
+ "value-name" : "transponder",
+ "value" : "TRNP_B"
+ },
+ {
+ "value-name" : "onos-index",
+ "value" : "1"
+ },
+ {
+ "value-name" : "test-driver",
+ "value" : "driver"
}
],
"administrative-state" : "UNLOCKED",
@@ -44,8 +72,11 @@
],
"conn-constraint" : {},
+
"topo-constraint" : {},
+
"resilience-constraint" : [ ],
+
"state" : "operational-state"
}
}
diff --git a/apps/odtn/src/test/resources/nbi-tapi-sample.json b/apps/odtn/src/test/resources/nbi-tapi-sample.json
index e0bd960..4578336 100644
--- a/apps/odtn/src/test/resources/nbi-tapi-sample.json
+++ b/apps/odtn/src/test/resources/nbi-tapi-sample.json
@@ -30,6 +30,7 @@
]
}
],
+
"tapi-connectivity:connectivity-service": [
{
"uuid" : "D0BF25C8-B20C-49C3-9030-1C5AEC993E44",
@@ -37,12 +38,16 @@
{
"local-id" : "TRPN_A-1",
"layer-protocol-name": "DSR",
- "service-interface-point": "9F759964-2410-44AF-8522-4FCE2C3ED464"
+ "service-interface-point": {
+ "service-interface-point-id" : "9F759964-2410-44AF-8522-4FCE2C3ED464"
+ }
},
{
"local-id" : "TRPN_B-1",
"layer-protocol-name": "DSR",
- "service-interface-point": "FBDDC006-8913-4509-BA71-485CFAC89567"
+ "service-interface-point": {
+ "service-interface-point-id" : "FBDDC006-8913-4509-BA71-485CFAC89567"
+ }
}
]
}