From 3bccabac70d77c10128f8441c9758fbf0b527f61 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 30 Oct 2017 14:53:49 -0400 Subject: [PATCH 01/16] Fix typos in GENERIC-RESOURCE-API Updated location of Yang-mapping properties file and fixed typo in Yang model for GENERIC-RESOURCE-API. Change-Id: I379274beefd5673cca5096ff3769b552e0475535 Issue-ID: SDNC-151 Signed-off-by: Dan Timoney --- generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang | 2 +- .../src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang index 2f45ae25..31582d8d 100644 --- a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang +++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang @@ -1685,7 +1685,7 @@ module GENERIC-RESOURCE-API { uses allotted-resource-status; } } - container brg-allotted-respources { + container brg-allotted-resources { list brg-allotted-resource { key "allotted-resource-id"; leaf allotted-resource-id { diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java index c03bc120..04d0b6fe 100644 --- a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java +++ b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java @@ -14,7 +14,7 @@ public class GenericResourceApiUtil extends MdsalHelper { private static final Logger LOG = LoggerFactory.getLogger(GenericResourceApiUtil.class); - public static final String PROPERTIES_FILE="/opt/bvc/controller/configuration/generic-resource-api.properties"; + public static final String PROPERTIES_FILE="/opt/opendaylight/current/configuration/generic-resource-api.properties"; private static Properties properties; -- 2.16.6 From a56bab303f781e0c1696f0335eefc7941363d766 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 1 Nov 2017 19:09:40 -0400 Subject: [PATCH 02/16] New tunnelxconn assignment Add new assignment (vg-ip) to tunnelxconn assignments container Change-Id: Ib9439ceb440b508007104b0a8452a9ae64255354 Issue-ID: SDNC-160 Signed-off-by: Dan Timoney --- .../model/src/main/yang/GENERIC-RESOURCE-API.yang | 38 +++++++++++++--------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang index 31582d8d..6f776287 100644 --- a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang +++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang @@ -821,18 +821,24 @@ module GENERIC-RESOURCE-API { } } grouping tunnelxconn-assignments { - leaf vni { - description "The Network Controller will assign a VNI value from the associated vGMUX VNI pool"; - type string; - } - leaf vgmux-bearer-ip { - description "The Network Controller will look up the vgmux bearer ip from the vgmux vf module"; - type inet:ip-address; - } - leaf vgmux-lan-ip { - description "The Network Controller will look up the vgmux lan ip from the vgmux vg module"; - type inet:ip-address; - } + container tunnelxconn-assignments { + leaf vni { + description "The Network Controller will assign a VNI value from the associated vGMUX VNI pool"; + type string; + } + leaf vgmux-bearer-ip { + description "The Network Controller will look up the vgmux bearer ip from the vgmux vf module"; + type inet:ip-address; + } + leaf vgmux-lan-ip { + description "The Network Controller will look up the vgmux lan ip from the vgmux vg module"; + type inet:ip-address; + } + leaf vg-ip { + description "The Network Controller will assign the VG IP address from local inventory"; + type inet:ip-address; + } + } } grouping brg-operation-information { uses sdnc-request-header; @@ -863,9 +869,11 @@ module GENERIC-RESOURCE-API { } } grouping brg-assignments { - leaf vbrg-wan-ip { - type inet:ip-address; - } + container brg-assignments { + leaf vbrg-wan-ip { + type inet:ip-address; + } + } } grouping allotted-resource-information { container allotted-resource-information { -- 2.16.6 From ce59c2c4496879cb99a9ecf38075096282fbdc11 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 3 Nov 2017 16:22:26 -0400 Subject: [PATCH 03/16] Update swagger doc for GENERIC-RESOURCE-API Update swagger v2.0 doc for GENERIC-RESOURCE-API to reflect changes made for new tunnelxconn assignment Change-Id: I3a298ff36a8eefc0a638dc40531f79137443cc56 Issue-ID: SDNC-160 Signed-off-by: Dan Timoney --- .../resources/generic-resource-api.20161111.json | 1056 ++++++++++++-------- 1 file changed, 653 insertions(+), 403 deletions(-) diff --git a/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json b/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json index c448afa8..7d39ff07 100644 --- a/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json +++ b/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json @@ -1,17 +1,9 @@ { "swagger": "2.0", "info": { - "version": "1.0.0", - "title" : "Generic Resource API", - "description" : "Generic Resource API", - "contact" : { - "name" : "ONAP SDNC team", - "email" : "onap-discuss@lists.onap.org", - "url" : "https://gerrit.onap.org/r/#/admin./projects/sdnc/sli/northbound" - } + "version": "1.0.0" }, "basePath": "/restconf", - "schemes" : [ "http" ], "paths": { "/config": { "post": { @@ -58,10 +50,10 @@ }, { "in": "body", - "name": "**(config)brg-allotted-respources", + "name": "**(config)brg-allotted-resources", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-allotted-respources-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-allotted-resources-TOP" } }, { @@ -84,7 +76,7 @@ "operationId": "POST-GENERIC-RESOURCE-API_module" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources": { "delete": { "produces": [ "application/json", @@ -95,7 +87,7 @@ "description": "No response was specified" } }, - "operationId": "DELETE-brg-allotted-respources" + "operationId": "DELETE-brg-allotted-resources" }, "get": { "produces": [ @@ -106,11 +98,11 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/(config)brg-allotted-respources" + "$ref": "#/definitions/(config)brg-allotted-resources" } } }, - "operationId": "GET-brg-allotted-respources" + "operationId": "GET-brg-allotted-resources" }, "post": { "consumes": [ @@ -127,7 +119,7 @@ "name": "**(config)brg-allotted-resource", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources(config)brg-allotted-resource-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources(config)brg-allotted-resource-TOP" } } ], @@ -135,11 +127,11 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/(config)brg-allotted-respourcesPOST" + "$ref": "#/definitions/(config)brg-allotted-resourcesPOST" } } }, - "operationId": "POST-brg-allotted-respources" + "operationId": "POST-brg-allotted-resources" }, "put": { "consumes": [ @@ -153,10 +145,10 @@ "parameters": [ { "in": "body", - "name": "(config)brg-allotted-respources", + "name": "(config)brg-allotted-resources", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-allotted-respources-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-allotted-resources-TOP" } } ], @@ -164,14 +156,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-allotted-respources-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-allotted-resources-TOP" } } }, - "operationId": "PUT-brg-allotted-respources" + "operationId": "PUT-brg-allotted-resources" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}": { "delete": { "produces": [ "application/json", @@ -236,7 +228,7 @@ "name": "**(config)allotted-resource-data", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-data-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-data-TOP" } }, { @@ -244,7 +236,7 @@ "name": "**(config)allotted-resource-status", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-status-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-status-TOP" } } ], @@ -279,7 +271,7 @@ "name": "(config)brg-allotted-resource", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources(config)brg-allotted-resource-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources(config)brg-allotted-resource-TOP" } } ], @@ -287,14 +279,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources(config)brg-allotted-resource-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources(config)brg-allotted-resource-TOP" } } }, "operationId": "PUT-brg-allotted-resource" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data": { "delete": { "produces": [ "application/json", @@ -359,7 +351,7 @@ "name": "**(config)allotted-resource-operation-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information-TOP" } }, { @@ -367,7 +359,7 @@ "name": "**(config)brg-topology", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-topology-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-topology-TOP" } }, { @@ -375,7 +367,7 @@ "name": "**(config)brg-parameters", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-parameters-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-parameters-TOP" } }, { @@ -383,7 +375,7 @@ "name": "**(config)allotted-resource-oper-status", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status-TOP" } } ], @@ -418,7 +410,7 @@ "name": "(config)allotted-resource-data", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-data-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-data-TOP" } } ], @@ -426,14 +418,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-data-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-data-TOP" } } }, "operationId": "PUT-allotted-resource-data" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": { "delete": { "produces": [ "application/json", @@ -498,7 +490,7 @@ "name": "(config)allotted-resource-oper-status", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status-TOP" } } ], @@ -506,14 +498,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status-TOP" } } }, "operationId": "PUT-allotted-resource-oper-status" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": { "delete": { "produces": [ "application/json", @@ -578,7 +570,7 @@ "name": "**(config)request-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" } }, { @@ -586,23 +578,23 @@ "name": "**(config)sdnc-request-header", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" } }, { "in": "body", - "name": "**(config)service-information", + "name": "**(config)allotted-resource-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP" } }, { "in": "body", - "name": "**(config)allotted-resource-information", + "name": "**(config)service-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" } } ], @@ -637,7 +629,7 @@ "name": "(config)allotted-resource-operation-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information-TOP" } } ], @@ -645,14 +637,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information-TOP" } } }, "operationId": "PUT-allotted-resource-operation-information" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": { "delete": { "produces": [ "application/json", @@ -717,7 +709,7 @@ "name": "**(config)onap-model-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information-TOP" } } ], @@ -752,7 +744,7 @@ "name": "(config)allotted-resource-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP" } } ], @@ -760,14 +752,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP" } } }, "operationId": "PUT-allotted-resource-information" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information/onap-model-information": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information/onap-model-information": { "delete": { "produces": [ "application/json", @@ -832,7 +824,7 @@ "name": "(config)onap-model-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information-TOP" } } ], @@ -840,14 +832,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information-TOP" } } }, "operationId": "PUT-onap-model-information" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/request-information": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/request-information": { "delete": { "produces": [ "application/json", @@ -912,7 +904,7 @@ "name": "(config)request-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" } } ], @@ -920,14 +912,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" } } }, "operationId": "PUT-request-information" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": { "delete": { "produces": [ "application/json", @@ -992,7 +984,7 @@ "name": "(config)sdnc-request-header", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" } } ], @@ -1000,14 +992,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" } } }, "operationId": "PUT-sdnc-request-header" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": { "delete": { "produces": [ "application/json", @@ -1072,7 +1064,7 @@ "name": "**(config)onap-model-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information-TOP" } } ], @@ -1107,7 +1099,7 @@ "name": "(config)service-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" } } ], @@ -1115,14 +1107,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" } } }, "operationId": "PUT-service-information" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information/onap-model-information": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information/onap-model-information": { "delete": { "produces": [ "application/json", @@ -1187,7 +1179,7 @@ "name": "(config)onap-model-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information-TOP" } } ], @@ -1195,14 +1187,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information-TOP" } } }, "operationId": "PUT-onap-model-information" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters": { "delete": { "produces": [ "application/json", @@ -1267,7 +1259,7 @@ "name": "**(config)param", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param-TOP" } } ], @@ -1302,7 +1294,7 @@ "name": "(config)brg-parameters", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-parameters-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-parameters-TOP" } } ], @@ -1310,14 +1302,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-parameters-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-parameters-TOP" } } }, "operationId": "PUT-brg-parameters" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters/param/{name}": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters/param/{name}": { "delete": { "produces": [ "application/json", @@ -1400,7 +1392,7 @@ "name": "(config)param", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param-TOP" } } ], @@ -1408,14 +1400,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param-TOP" } } }, "operationId": "PUT-param" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology": { "delete": { "produces": [ "application/json", @@ -1480,7 +1472,7 @@ "name": "**(config)brg-parameters", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters-TOP" } }, { @@ -1488,7 +1480,7 @@ "name": "**(config)allotted-resource-identifiers", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers-TOP" } }, { @@ -1496,7 +1488,15 @@ "name": "**(config)onap-model-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information-TOP" + } + }, + { + "in": "body", + "name": "**(config)brg-assignments", + "required": false, + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-assignments-TOP" } } ], @@ -1531,7 +1531,7 @@ "name": "(config)brg-topology", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-topology-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-topology-TOP" } } ], @@ -1539,14 +1539,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-topology-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-topology-TOP" } } }, "operationId": "PUT-brg-topology" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/allotted-resource-identifiers": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/allotted-resource-identifiers": { "delete": { "produces": [ "application/json", @@ -1611,7 +1611,7 @@ "name": "(config)allotted-resource-identifiers", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers-TOP" } } ], @@ -1619,14 +1619,94 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers-TOP" } } }, "operationId": "PUT-allotted-resource-identifiers" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-assignments": { + "delete": { + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "No response was specified" + } + }, + "operationId": "DELETE-brg-assignments" + }, + "get": { + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "No response was specified", + "schema": { + "$ref": "#/definitions/(config)brg-assignments" + } + } + }, + "operationId": "GET-brg-assignments" + }, + "put": { + "consumes": [ + "application/json", + "application/xml" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + }, + { + "in": "body", + "name": "(config)brg-assignments", + "required": false, + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-assignments-TOP" + } + } + ], + "responses": { + "200": { + "description": "No response was specified", + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-assignments-TOP" + } + } + }, + "operationId": "PUT-brg-assignments" + } + }, + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters": { "delete": { "produces": [ "application/json", @@ -1691,7 +1771,7 @@ "name": "**(config)param", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param-TOP" } } ], @@ -1726,7 +1806,7 @@ "name": "(config)brg-parameters", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters-TOP" } } ], @@ -1734,14 +1814,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters-TOP" } } }, "operationId": "PUT-brg-parameters" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters/param/{name}": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters/param/{name}": { "delete": { "produces": [ "application/json", @@ -1824,7 +1904,7 @@ "name": "(config)param", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param-TOP" } } ], @@ -1832,14 +1912,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param-TOP" } } }, "operationId": "PUT-param" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/onap-model-information": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/onap-model-information": { "delete": { "produces": [ "application/json", @@ -1904,7 +1984,7 @@ "name": "(config)onap-model-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information-TOP" } } ], @@ -1912,14 +1992,14 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information-TOP" } } }, "operationId": "PUT-onap-model-information" } }, - "/config/GENERIC-RESOURCE-API:brg-allotted-respources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-status": { + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-status": { "delete": { "produces": [ "application/json", @@ -1984,7 +2064,7 @@ "name": "(config)allotted-resource-status", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-status-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-status-TOP" } } ], @@ -1992,7 +2072,7 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-status-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-status-TOP" } } }, @@ -2482,34 +2562,34 @@ }, { "in": "body", - "name": "**(config)sdnc-request-header", + "name": "**(config)request-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" } }, { "in": "body", - "name": "**(config)request-information", + "name": "**(config)sdnc-request-header", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" } }, { "in": "body", - "name": "**(config)service-information", + "name": "**(config)contrail-route-request-input", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)contrail-route-request-input-TOP" } }, { "in": "body", - "name": "**(config)contrail-route-request-input", + "name": "**(config)service-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)contrail-route-request-input-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" } }, { @@ -5163,26 +5243,26 @@ }, { "in": "body", - "name": "**(config)network-policy", + "name": "**(config)network-topology-identifier", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-policy-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-topology-identifier-TOP" } }, { "in": "body", - "name": "**(config)route-table-reference", + "name": "**(config)network-policy", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)route-table-reference-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-policy-TOP" } }, { "in": "body", - "name": "**(config)network-topology-identifier", + "name": "**(config)route-table-reference", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-topology-identifier-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)route-table-reference-TOP" } }, { @@ -6030,18 +6110,18 @@ }, { "in": "body", - "name": "**(config)vnf-topology-identifier", + "name": "**(config)vnf-parameters", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-topology-identifier-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-parameters-TOP" } }, { "in": "body", - "name": "**(config)vnf-parameters", + "name": "**(config)vnf-topology-identifier", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-parameters-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-topology-identifier-TOP" } }, { @@ -9885,18 +9965,18 @@ }, { "in": "body", - "name": "**(config)onap-model-information", + "name": "**(config)security-zone-assignments", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/security-zone-allotted-resources/security-zone-allotted-resource/allotted-resource-data/security-zone-topology(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/security-zone-allotted-resources/security-zone-allotted-resource/allotted-resource-data/security-zone-topology(config)security-zone-assignments-TOP" } }, { "in": "body", - "name": "**(config)security-zone-assignments", + "name": "**(config)onap-model-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/security-zone-allotted-resources/security-zone-allotted-resource/allotted-resource-data/security-zone-topology(config)security-zone-assignments-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/security-zone-allotted-resources/security-zone-allotted-resource/allotted-resource-data/security-zone-topology(config)onap-model-information-TOP" } } ], @@ -10790,34 +10870,34 @@ }, { "in": "body", - "name": "**(config)service-level-oper-status", + "name": "**(config)service-topology", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-level-oper-status-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-topology-TOP" } }, { "in": "body", - "name": "**(config)service-topology", + "name": "**(config)service-level-oper-status", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-topology-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-level-oper-status-TOP" } }, { "in": "body", - "name": "**(config)sdnc-request-header", + "name": "**(config)request-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)request-information-TOP" } }, { "in": "body", - "name": "**(config)request-information", + "name": "**(config)sdnc-request-header", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)sdnc-request-header-TOP" } }, { @@ -11473,26 +11553,26 @@ }, { "in": "body", - "name": "**(config)sdnc-request-header", + "name": "**(config)request-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)request-information-TOP" } }, { "in": "body", - "name": "**(config)request-information", + "name": "**(config)sdnc-request-header", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)sdnc-request-header-TOP" } }, { "in": "body", - "name": "**(config)network-information", + "name": "**(config)service-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)network-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)service-information-TOP" } }, { @@ -11505,10 +11585,10 @@ }, { "in": "body", - "name": "**(config)service-information", + "name": "**(config)network-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)network-information-TOP" } } ], @@ -12507,26 +12587,26 @@ }, { "in": "body", - "name": "**(config)network-topology-identifier-structure", + "name": "**(config)network-parameters", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-topology-identifier-structure-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-parameters-TOP" } }, { "in": "body", - "name": "**(config)network-assignments", + "name": "**(config)network-topology-identifier-structure", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-assignments-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-topology-identifier-structure-TOP" } }, { "in": "body", - "name": "**(config)network-parameters", + "name": "**(config)network-assignments", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-parameters-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-assignments-TOP" } } ], @@ -14677,18 +14757,18 @@ }, { "in": "body", - "name": "**(config)service-parameters", + "name": "**(config)service-topology-identifier", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-parameters-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-topology-identifier-TOP" } }, { "in": "body", - "name": "**(config)service-topology-identifier", + "name": "**(config)service-parameters", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-topology-identifier-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-parameters-TOP" } }, { @@ -15585,50 +15665,50 @@ }, { "in": "body", - "name": "**(config)request-information", + "name": "**(config)vnf-topology", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-topology-TOP" } }, { "in": "body", - "name": "**(config)sdnc-request-header", + "name": "**(config)request-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)request-information-TOP" } }, { "in": "body", - "name": "**(config)service-information", + "name": "**(config)sdnc-request-header", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)sdnc-request-header-TOP" } }, { "in": "body", - "name": "**(config)vnf-request-input", + "name": "**(config)vnf-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-request-input-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-information-TOP" } }, { "in": "body", - "name": "**(config)vnf-information", + "name": "**(config)service-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)service-information-TOP" } }, { "in": "body", - "name": "**(config)vnf-topology", + "name": "**(config)vnf-request-input", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-topology-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-request-input-TOP" } } ], @@ -16550,42 +16630,42 @@ }, { "in": "body", - "name": "**(config)sdnc-request-header", + "name": "**(config)request-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)request-information-TOP" } }, { "in": "body", - "name": "**(config)request-information", + "name": "**(config)sdnc-request-header", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)sdnc-request-header-TOP" } }, { "in": "body", - "name": "**(config)vf-module-information", + "name": "**(config)service-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)service-information-TOP" } }, { "in": "body", - "name": "**(config)vf-module-request-input", + "name": "**(config)vf-module-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-request-input-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-information-TOP" } }, { "in": "body", - "name": "**(config)service-information", + "name": "**(config)vf-module-request-input", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-request-input-TOP" } }, { @@ -18173,18 +18253,18 @@ }, { "in": "body", - "name": "**(config)vf-module-topology-identifier", + "name": "**(config)onap-model-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology(config)vf-module-topology-identifier-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology(config)onap-model-information-TOP" } }, { "in": "body", - "name": "**(config)onap-model-information", + "name": "**(config)vf-module-topology-identifier", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology(config)vf-module-topology-identifier-TOP" } }, { @@ -25830,18 +25910,18 @@ }, { "in": "body", - "name": "**(config)allotted-resource-information", + "name": "**(config)service-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" } }, { "in": "body", - "name": "**(config)service-information", + "name": "**(config)allotted-resource-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP" } } ], @@ -26722,6 +26802,14 @@ "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-parameters-TOP" } }, + { + "in": "body", + "name": "**(config)allotted-resource-identifiers", + "required": false, + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)allotted-resource-identifiers-TOP" + } + }, { "in": "body", "name": "**(config)onap-model-information", @@ -26732,10 +26820,10 @@ }, { "in": "body", - "name": "**(config)allotted-resource-identifiers", + "name": "**(config)tunnelxconn-assignments", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)allotted-resource-identifiers-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-assignments-TOP" } } ], @@ -26945,6 +27033,86 @@ "operationId": "PUT-onap-model-information" } }, + "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-assignments": { + "delete": { + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "No response was specified" + } + }, + "operationId": "DELETE-tunnelxconn-assignments" + }, + "get": { + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "No response was specified", + "schema": { + "$ref": "#/definitions/(config)tunnelxconn-assignments" + } + } + }, + "operationId": "GET-tunnelxconn-assignments" + }, + "put": { + "consumes": [ + "application/json", + "application/xml" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + }, + { + "in": "body", + "name": "(config)tunnelxconn-assignments", + "required": false, + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-assignments-TOP" + } + } + ], + "responses": { + "200": { + "description": "No response was specified", + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-assignments-TOP" + } + } + }, + "operationId": "PUT-tunnelxconn-assignments" + } + }, "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-parameters": { "delete": { "produces": [ @@ -27238,7 +27406,7 @@ "operationId": "PUT-allotted-resource-status" } }, - "/operational/GENERIC-RESOURCE-API:brg-allotted-respources": { + "/operational/GENERIC-RESOURCE-API:brg-allotted-resources": { "get": { "produces": [ "application/json", @@ -27248,11 +27416,11 @@ "200": { "description": "No response was specified", "schema": { - "$ref": "#/definitions/(operational)brg-allotted-respources" + "$ref": "#/definitions/(operational)brg-allotted-resources" } } }, - "operationId": "GET-brg-allotted-respources" + "operationId": "GET-brg-allotted-resources" } }, "/operational/GENERIC-RESOURCE-API:contrail-route-allotted-resources": { @@ -27661,10 +27829,10 @@ "type": "object" }, "GENERIC-RESOURCE-API:brg-wan-ip-address": { - "$ref": "#/definitions/0.4.5.4", + "$ref": "#/definitions/0.3.56.0%p", "enum": [ - "0.4.5.4", - "d5c:" + "0.3.56.0%p", + "5cB:e8b%LpL}pp" ] }, "GENERIC-RESOURCE-API:request-information": { @@ -27686,10 +27854,10 @@ "type": "object" }, "GENERIC-RESOURCE-API:vgmux-bearer-ip": { - "$ref": "#/definitions/1.0.1.1", + "$ref": "#/definitions/1.0.21.6", "enum": [ - "1.0.1.1", - "A:D:B0ba" + "1.0.21.6", + ":" ] }, "GENERIC-RESOURCE-API:vni": { @@ -27755,9 +27923,9 @@ }, "(config)GENERIC-RESOURCE-API_modulePOST": { "properties": { - "brg-allotted-respources": { + "brg-allotted-resources": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-allotted-respources" + "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-allotted-resources" }, "type": "object" }, @@ -27798,25 +27966,25 @@ "properties": { "allotted-resource-oper-status": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status" }, "type": "object" }, "allotted-resource-operation-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information" }, "type": "object" }, "brg-parameters": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-parameters" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-parameters" }, "type": "object" }, "brg-topology": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-topology" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-topology" }, "type": "object" } @@ -27947,40 +28115,40 @@ "properties": { "allotted-resource-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information" }, "type": "object" }, "brg-wan-ip-address": { - "$ref": "#/definitions/1.1.62.1%NN", + "$ref": "#/definitions/27.0.29.2", "enum": [ - "1.1.62.1%NN", - "5:" + "27.0.29.2", + ":50%{p" ] }, "request-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information" }, "type": "object" }, "sdnc-request-header": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header" }, "type": "object" }, "service-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information" }, "type": "object" }, "vgmux-bearer-ip": { - "$ref": "#/definitions/114.2.0.2", + "$ref": "#/definitions/2.0.0.0%N{", "enum": [ - "114.2.0.2", - "ceC:" + "2.0.0.0%N{", + "D::D%NN" ] }, "vni": { @@ -28063,7 +28231,7 @@ "properties": { "allotted-resource-data": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-data" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-data" }, "type": "object" }, @@ -28072,7 +28240,7 @@ }, "allotted-resource-status": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-status" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-status" }, "type": "object" } @@ -28082,22 +28250,34 @@ ], "type": "object" }, - "(config)brg-allotted-respourcesPOST": { + "(config)brg-allotted-resourcesPOST": { "properties": { "brg-allotted-resource": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources(config)brg-allotted-resource" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources(config)brg-allotted-resource" }, "type": "array" } }, "type": "object" }, + "(config)brg-assignmentsPOST": { + "properties": { + "vbrg-wan-ip": { + "$ref": "#/definitions/4.254.7.5%{L", + "enum": [ + "4.254.7.5%{L", + "0a6:" + ] + } + }, + "type": "object" + }, "(config)brg-parametersPOST": { "properties": { "param": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param" }, "type": "array" } @@ -28120,28 +28300,27 @@ "properties": { "allotted-resource-identifiers": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers" + }, + "type": "object" + }, + "brg-assignments": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-assignments" }, "type": "object" }, "brg-parameters": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters" }, "type": "object" }, "onap-model-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information" }, "type": "object" - }, - "vbrg-wan-ip": { - "$ref": "#/definitions/0.80.7.0%p", - "enum": [ - "0.80.7.0%p", - "E:e" - ] } }, "type": "object" @@ -28387,11 +28566,11 @@ "(config)interface-route-prefixesPOST": { "properties": { "interface-route-prefix": { - "$ref": "#/definitions/0.0.0.0%pNpN", + "$ref": "#/definitions/2.178.7.3%{", "description": "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes", "enum": [ - "0.0.0.0%pNpN", - "aEF7:1" + "2.178.7.3%{", + ":%N" ] }, "interface-route-prefix-cidr": { @@ -28532,7 +28711,7 @@ "(config)network-ips-v6POST": { "properties": { "ip-address-ipv6": { - "$ref": "#/definitions/Da:", + "$ref": "#/definitions/B:9", "description": "List of assigned ipv6 addresses on a network" } }, @@ -28541,11 +28720,11 @@ "(config)network-ipsPOST": { "properties": { "ip-address": { - "$ref": "#/definitions/8.82.2.0%}N}", + "$ref": "#/definitions/3.1.2.4", "description": "List of assigned ipv4 addresses on a network", "enum": [ - "8.82.2.0%}N}", - ":c%Lp" + "3.1.2.4", + "C8CE:" ] } }, @@ -29710,20 +29889,20 @@ "$ref": "#/definitions/Some dhcp-start-address" }, "gateway-address": { - "$ref": "#/definitions/0.155.242.17%{{", + "$ref": "#/definitions/1.7.0.5", "enum": [ - "0.155.242.17%{{", - "c:A5" + "1.7.0.5", + ":B%}LLp" ] }, "ip-version": { "$ref": "#/definitions/Some ip-version" }, "start-address": { - "$ref": "#/definitions/1.0.3.2%}LpL", + "$ref": "#/definitions/0.0.7.0%{N{", "enum": [ - "1.0.3.2%}LpL", - "2E:DEFe%Lp" + "0.0.7.0%{N{", + "dce4:::" ] }, "subnet-name": { @@ -29766,6 +29945,39 @@ }, "type": "object" }, + "(config)tunnelxconn-assignmentsPOST": { + "properties": { + "vg-ip": { + "$ref": "#/definitions/255.148.0.1%{N", + "description": "The Network Controller will assign the VG IP address from local inventory", + "enum": [ + "255.148.0.1%{N", + "f:" + ] + }, + "vgmux-bearer-ip": { + "$ref": "#/definitions/16.46.115.1", + "description": "The Network Controller will look up the vgmux bearer ip from the vgmux vf module", + "enum": [ + "16.46.115.1", + ":%{N" + ] + }, + "vgmux-lan-ip": { + "$ref": "#/definitions/1.8.23.91%}pNLLpp", + "description": "The Network Controller will look up the vgmux lan ip from the vgmux vg module", + "enum": [ + "1.8.23.91%}pNLLpp", + "Ac::" + ] + }, + "vni": { + "$ref": "#/definitions/Some vni", + "description": "The Network Controller will assign a VNI value from the associated vGMUX VNI pool" + } + }, + "type": "object" + }, "(config)tunnelxconn-parametersPOST": { "properties": { "param": { @@ -29803,31 +30015,17 @@ }, "type": "object" }, + "tunnelxconn-assignments": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-assignments" + }, + "type": "object" + }, "tunnelxconn-parameters": { "items": { "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-parameters" }, "type": "object" - }, - "vgmux-bearer-ip": { - "$ref": "#/definitions/1.193.7.25%N", - "description": "The Network Controller will look up the vgmux bearer ip from the vgmux vf module", - "enum": [ - "1.193.7.25%N", - "FF:27%N" - ] - }, - "vgmux-lan-up": { - "$ref": "#/definitions/0.0.1.0%{{pNN}pNpL", - "description": "The Network Controller will look up the vgmux lan ip from the vgmux vg module", - "enum": [ - "0.0.1.0%{{pNN}pNpL", - ":" - ] - }, - "vni": { - "$ref": "#/definitions/Some vni", - "description": "The Network Controller will assign a VNI value from the associated vGMUX VNI pool" } }, "type": "object" @@ -30195,15 +30393,15 @@ "(config)vm-networksPOST": { "properties": { "floating-ip": { - "$ref": "#/definitions/44.115.2.2%}{N{{", + "$ref": "#/definitions/0.0.0.7", "description": "Floating ipv4 for VMs of a given type on this network", "enum": [ - "44.115.2.2%}{N{{", - "f0:" + "0.0.0.7", + ":" ] }, "floating-ip-v6": { - "$ref": "#/definitions/7::%p", + "$ref": "#/definitions/:2", "description": "Floating ipv6 for VMs of a given type on this network" }, "interface-route-prefixes": { @@ -31652,22 +31850,22 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API(config)brg-allotted-respources": { + "GENERIC-RESOURCE-API(config)brg-allotted-resources": { "properties": { "GENERIC-RESOURCE-API:brg-allotted-resource": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources(config)brg-allotted-resource" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources(config)brg-allotted-resource" }, "type": "array" } }, "type": "object" }, - "GENERIC-RESOURCE-API(config)brg-allotted-respources-TOP": { + "GENERIC-RESOURCE-API(config)brg-allotted-resources-TOP": { "properties": { - "GENERIC-RESOURCE-API:brg-allotted-respources": { + "GENERIC-RESOURCE-API:brg-allotted-resources": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-allotted-respources" + "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-allotted-resources" }, "type": "object" } @@ -32502,14 +32700,14 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API(operational)brg-allotted-respources": { + "GENERIC-RESOURCE-API(operational)brg-allotted-resources": { "type": "object" }, - "GENERIC-RESOURCE-API(operational)brg-allotted-respources-TOP": { + "GENERIC-RESOURCE-API(operational)brg-allotted-resources-TOP": { "properties": { - "GENERIC-RESOURCE-API:brg-allotted-respources": { + "GENERIC-RESOURCE-API:brg-allotted-resources": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API(operational)brg-allotted-respources" + "$ref": "#/definitions/GENERIC-RESOURCE-API(operational)brg-allotted-resources" }, "type": "object" } @@ -32620,11 +32818,11 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources(config)brg-allotted-resource": { + "GENERIC-RESOURCE-API/brg-allotted-resources(config)brg-allotted-resource": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-data": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-data" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-data" }, "type": "object" }, @@ -32633,7 +32831,7 @@ }, "GENERIC-RESOURCE-API:allotted-resource-status": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-status" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-status" }, "type": "object" } @@ -32643,58 +32841,58 @@ ], "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources(config)brg-allotted-resource-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources(config)brg-allotted-resource-TOP": { "properties": { "GENERIC-RESOURCE-API:brg-allotted-resource": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources(config)brg-allotted-resource" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources(config)brg-allotted-resource" }, "type": "array" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-data": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-data": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-oper-status": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status" }, "type": "object" }, "GENERIC-RESOURCE-API:allotted-resource-operation-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information" }, "type": "object" }, "GENERIC-RESOURCE-API:brg-parameters": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-parameters" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-parameters" }, "type": "object" }, "GENERIC-RESOURCE-API:brg-topology": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-topology" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-topology" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-data-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-data-TOP": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-data": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-data" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-data" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-status": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-status": { "properties": { "GENERIC-RESOURCE-API:action": { "$ref": "#/definitions/Some action", @@ -32738,18 +32936,18 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-status-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-status-TOP": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-status": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource(config)allotted-resource-status" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource(config)allotted-resource-status" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status": { "properties": { "GENERIC-RESOURCE-API:create-timestamp": { "$ref": "#/definitions/Some create-timestamp", @@ -32823,55 +33021,55 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status-TOP": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-oper-status": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-oper-status" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information" }, "type": "object" }, "GENERIC-RESOURCE-API:brg-wan-ip-address": { - "$ref": "#/definitions/24.0.1.23%N", + "$ref": "#/definitions/0.3.1.29", "enum": [ - "24.0.1.23%N", - ":%}{" + "0.3.1.29", + "926d:" ] }, "GENERIC-RESOURCE-API:request-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information" }, "type": "object" }, "GENERIC-RESOURCE-API:sdnc-request-header": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header" }, "type": "object" }, "GENERIC-RESOURCE-API:service-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information" }, "type": "object" }, "GENERIC-RESOURCE-API:vgmux-bearer-ip": { - "$ref": "#/definitions/22.1.0.99%{", + "$ref": "#/definitions/1.85.0.0", "enum": [ - "22.1.0.99%{", - "6d:1:" + "1.85.0.0", + "be:" ] }, "GENERIC-RESOURCE-API:vni": { @@ -32880,81 +33078,80 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information-TOP": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-operation-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)allotted-resource-operation-information" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-parameters": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-parameters": { "properties": { "GENERIC-RESOURCE-API:param": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param" }, "type": "array" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-parameters-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-parameters-TOP": { "properties": { "GENERIC-RESOURCE-API:brg-parameters": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-parameters" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-parameters" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-topology": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-topology": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-identifiers": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers" + }, + "type": "object" + }, + "GENERIC-RESOURCE-API:brg-assignments": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-assignments" }, "type": "object" }, "GENERIC-RESOURCE-API:brg-parameters": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters" }, "type": "object" }, "GENERIC-RESOURCE-API:onap-model-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information" }, "type": "object" - }, - "GENERIC-RESOURCE-API:vbrg-wan-ip": { - "$ref": "#/definitions/0.250.2.12", - "enum": [ - "0.250.2.12", - "d:" - ] } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-topology-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-topology-TOP": { "properties": { "GENERIC-RESOURCE-API:brg-topology": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data(config)brg-topology" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data(config)brg-topology" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-id": { "$ref": "#/definitions/Some allotted-resource-id" @@ -32965,7 +33162,7 @@ }, "GENERIC-RESOURCE-API:onap-model-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information" }, "type": "object" }, @@ -32976,18 +33173,18 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information": { "properties": { "GENERIC-RESOURCE-API:notification-url": { "$ref": "#/definitions/Some notification-url" @@ -33031,18 +33228,18 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP": { "properties": { "GENERIC-RESOURCE-API:request-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header": { "properties": { "GENERIC-RESOURCE-API:svc-action": { "$ref": "#/definitions/reserve", @@ -33071,18 +33268,18 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP": { "properties": { "GENERIC-RESOURCE-API:sdnc-request-header": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information": { "properties": { "GENERIC-RESOURCE-API:global-customer-id": { "$ref": "#/definitions/Some global-customer-id", @@ -33090,7 +33287,7 @@ }, "GENERIC-RESOURCE-API:onap-model-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information" }, "type": "object" }, @@ -33112,18 +33309,18 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP": { "properties": { "GENERIC-RESOURCE-API:service-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information": { "properties": { "GENERIC-RESOURCE-API:model-customization-uuid": { "$ref": "#/definitions/Some model-customization-uuid", @@ -33146,18 +33343,18 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information-TOP": { "properties": { "GENERIC-RESOURCE-API:onap-model-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information": { "properties": { "GENERIC-RESOURCE-API:model-customization-uuid": { "$ref": "#/definitions/Some model-customization-uuid", @@ -33180,18 +33377,18 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information-TOP": { "properties": { "GENERIC-RESOURCE-API:onap-model-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information/service-information(config)onap-model-information" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param": { "properties": { "GENERIC-RESOURCE-API:name": { "$ref": "#/definitions/Some name" @@ -33202,18 +33399,18 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param-TOP": { "properties": { "GENERIC-RESOURCE-API:param": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-parameters(config)param" }, "type": "array" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-id": { "$ref": "#/definitions/Some allotted-resource-id" @@ -33237,40 +33434,63 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers-TOP": { "properties": { "GENERIC-RESOURCE-API:allotted-resource-identifiers": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)allotted-resource-identifiers" + }, + "type": "object" + } + }, + "type": "object" + }, + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-assignments": { + "properties": { + "GENERIC-RESOURCE-API:vbrg-wan-ip": { + "$ref": "#/definitions/1.2.0.2", + "enum": [ + "1.2.0.2", + "8Cad:8df9" + ] + } + }, + "type": "object" + }, + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-assignments-TOP": { + "properties": { + "GENERIC-RESOURCE-API:brg-assignments": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-assignments" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters": { "properties": { "GENERIC-RESOURCE-API:param": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param" }, "type": "array" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters-TOP": { "properties": { "GENERIC-RESOURCE-API:brg-parameters": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-parameters" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information": { "properties": { "GENERIC-RESOURCE-API:model-customization-uuid": { "$ref": "#/definitions/Some model-customization-uuid", @@ -33293,18 +33513,18 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information-TOP": { "properties": { "GENERIC-RESOURCE-API:onap-model-information": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)onap-model-information" }, "type": "object" } }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param": { "properties": { "GENERIC-RESOURCE-API:name": { "$ref": "#/definitions/Some name" @@ -33315,11 +33535,11 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param-TOP": { + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param-TOP": { "properties": { "GENERIC-RESOURCE-API:param": { "items": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-respources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param" + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology/brg-parameters(config)param" }, "type": "array" } @@ -34527,20 +34747,20 @@ "$ref": "#/definitions/Some dhcp-start-address" }, "GENERIC-RESOURCE-API:gateway-address": { - "$ref": "#/definitions/8.4.1.0", + "$ref": "#/definitions/21.184.2.0", "enum": [ - "8.4.1.0", - "60:0" + "21.184.2.0", + "::%pN" ] }, "GENERIC-RESOURCE-API:ip-version": { "$ref": "#/definitions/Some ip-version" }, "GENERIC-RESOURCE-API:start-address": { - "$ref": "#/definitions/16.4.0.0%Lp", + "$ref": "#/definitions/252.2.183.0", "enum": [ - "16.4.0.0%Lp", - "05A:" + "252.2.183.0", + "aA:d3" ] }, "GENERIC-RESOURCE-API:subnet-name": { @@ -34914,20 +35134,20 @@ "$ref": "#/definitions/Some dhcp-start-address" }, "GENERIC-RESOURCE-API:gateway-address": { - "$ref": "#/definitions/1.0.0.24%{ppL", + "$ref": "#/definitions/192.0.197.0", "enum": [ - "1.0.0.24%{ppL", - "b:1" + "192.0.197.0", + "C::0" ] }, "GENERIC-RESOURCE-API:ip-version": { "$ref": "#/definitions/Some ip-version" }, "GENERIC-RESOURCE-API:start-address": { - "$ref": "#/definitions/4.0.11.0%N}{", + "$ref": "#/definitions/8.12.3.5%NL}", "enum": [ - "4.0.11.0%N}{", - "0bdE:%N" + "8.12.3.5%NL}", + "fCe9:" ] }, "GENERIC-RESOURCE-API:subnet-name": { @@ -35229,15 +35449,15 @@ "GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms(config)vm-networks": { "properties": { "GENERIC-RESOURCE-API:floating-ip": { - "$ref": "#/definitions/21.0.9.0%NLLNp{", + "$ref": "#/definitions/0.9.254.2%LL", "description": "Floating ipv4 for VMs of a given type on this network", "enum": [ - "21.0.9.0%NLLNp{", - "B62c:" + "0.9.254.2%LL", + ":" ] }, "GENERIC-RESOURCE-API:floating-ip-v6": { - "$ref": "#/definitions/:", + "$ref": "#/definitions/3:1d", "description": "Floating ipv6 for VMs of a given type on this network" }, "GENERIC-RESOURCE-API:interface-route-prefixes": { @@ -35297,11 +35517,11 @@ "GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": { "properties": { "GENERIC-RESOURCE-API:interface-route-prefix": { - "$ref": "#/definitions/12.1.1.27%L", + "$ref": "#/definitions/25.25.49.13%{N", "description": "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes", "enum": [ - "12.1.1.27%L", - "CEee:25" + "25.25.49.13%{N", + "f58f:2%}}NppNLpL" ] }, "GENERIC-RESOURCE-API:interface-route-prefix-cidr": { @@ -35328,11 +35548,11 @@ "GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": { "properties": { "GENERIC-RESOURCE-API:ip-address": { - "$ref": "#/definitions/4.99.24.0%}", + "$ref": "#/definitions/1.0.4.243%LLLpL}p", "description": "List of assigned ipv4 addresses on a network", "enum": [ - "4.99.24.0%}", - "D3eC:0D" + "1.0.4.243%LLLpL}p", + "d:7:Fb:" ] } }, @@ -35352,7 +35572,7 @@ "GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": { "properties": { "GENERIC-RESOURCE-API:ip-address-ipv6": { - "$ref": "#/definitions/06C3:0", + "$ref": "#/definitions/Dc6b:", "description": "List of assigned ipv6 addresses on a network" } }, @@ -39197,10 +39417,10 @@ "GENERIC-RESOURCE-API:floating-ip-v4": { "description": "Floating ipv4 for VMs of a given type on this network", "items": { - "$ref": "#/definitions/0.13.1.0%{N{}", + "$ref": "#/definitions/6.252.1.9%{LL", "enum": [ - "0.13.1.0%{N{}", - "cfeF:a%L}Lp{NLN{" + "6.252.1.9%{LL", + "B:" ] }, "type": "array" @@ -39208,7 +39428,7 @@ "GENERIC-RESOURCE-API:floating-ip-v6": { "description": "Floating ipv6 for VMs of a given type on this network", "items": { - "$ref": "#/definitions/:" + "$ref": "#/definitions/A9e6:2e" }, "type": "array" } @@ -40301,31 +40521,17 @@ }, "type": "object" }, + "GENERIC-RESOURCE-API:tunnelxconn-assignments": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-assignments" + }, + "type": "object" + }, "GENERIC-RESOURCE-API:tunnelxconn-parameters": { "items": { "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-parameters" }, "type": "object" - }, - "GENERIC-RESOURCE-API:vgmux-bearer-ip": { - "$ref": "#/definitions/99.12.4.12", - "description": "The Network Controller will look up the vgmux bearer ip from the vgmux vf module", - "enum": [ - "99.12.4.12", - "A9:" - ] - }, - "GENERIC-RESOURCE-API:vgmux-lan-up": { - "$ref": "#/definitions/1.8.25.0%}", - "description": "The Network Controller will look up the vgmux lan ip from the vgmux vg module", - "enum": [ - "1.8.25.0%}", - "f:02" - ] - }, - "GENERIC-RESOURCE-API:vni": { - "$ref": "#/definitions/Some vni", - "description": "The Network Controller will assign a VNI value from the associated vGMUX VNI pool" } }, "type": "object" @@ -40669,6 +40875,50 @@ }, "type": "object" }, + "GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-assignments": { + "properties": { + "GENERIC-RESOURCE-API:vg-ip": { + "$ref": "#/definitions/22.80.15.0%L", + "description": "The Network Controller will assign the VG IP address from local inventory", + "enum": [ + "22.80.15.0%L", + "bD4:ca" + ] + }, + "GENERIC-RESOURCE-API:vgmux-bearer-ip": { + "$ref": "#/definitions/2.204.65.2", + "description": "The Network Controller will look up the vgmux bearer ip from the vgmux vf module", + "enum": [ + "2.204.65.2", + "8ce::" + ] + }, + "GENERIC-RESOURCE-API:vgmux-lan-ip": { + "$ref": "#/definitions/2.0.254.1%p", + "description": "The Network Controller will look up the vgmux lan ip from the vgmux vg module", + "enum": [ + "2.0.254.1%p", + "FF3b:285" + ] + }, + "GENERIC-RESOURCE-API:vni": { + "$ref": "#/definitions/Some vni", + "description": "The Network Controller will assign a VNI value from the associated vGMUX VNI pool" + } + }, + "type": "object" + }, + "GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-assignments-TOP": { + "properties": { + "GENERIC-RESOURCE-API:tunnelxconn-assignments": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-assignments" + }, + "type": "object" + } + }, + "type": "object" + }, "GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-parameters": { "properties": { "GENERIC-RESOURCE-API:param": { @@ -41239,15 +41489,15 @@ "GENERIC-RESOURCE-API/vnf-topology-information/vnf-assignments/vnf-vms(config)vm-networks": { "properties": { "GENERIC-RESOURCE-API:floating-ip": { - "$ref": "#/definitions/0.44.25.29%}pLN", + "$ref": "#/definitions/1.25.3.1%L{N{pNLL}}{pL{Lpp}N", "description": "Floating ipv4 for VMs of a given type on this network", "enum": [ - "0.44.25.29%}pLN", - ":" + "1.25.3.1%L{N{pNLL}}{pL{Lpp}N", + "3::08B3" ] }, "GENERIC-RESOURCE-API:floating-ip-v6": { - "$ref": "#/definitions/BDff:E", + "$ref": "#/definitions/cEa:", "description": "Floating ipv6 for VMs of a given type on this network" }, "GENERIC-RESOURCE-API:interface-route-prefixes": { @@ -41307,11 +41557,11 @@ "GENERIC-RESOURCE-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": { "properties": { "GENERIC-RESOURCE-API:interface-route-prefix": { - "$ref": "#/definitions/0.168.1.4", + "$ref": "#/definitions/3.209.0.0%N}p{", "description": "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes", "enum": [ - "0.168.1.4", - "6f3f:b" + "3.209.0.0%N}p{", + ":2%L}" ] }, "GENERIC-RESOURCE-API:interface-route-prefix-cidr": { @@ -41338,11 +41588,11 @@ "GENERIC-RESOURCE-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": { "properties": { "GENERIC-RESOURCE-API:ip-address": { - "$ref": "#/definitions/2.0.253.0%}N}{N{}p}", + "$ref": "#/definitions/0.0.28.122%{", "description": "List of assigned ipv4 addresses on a network", "enum": [ - "2.0.253.0%}N}{N{}p}", - ":2A3" + "0.0.28.122%{", + ":4%L}pL" ] } }, @@ -41362,7 +41612,7 @@ "GENERIC-RESOURCE-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": { "properties": { "GENERIC-RESOURCE-API:ip-address-ipv6": { - "$ref": "#/definitions/1:61e%{", + "$ref": "#/definitions/:", "description": "List of assigned ipv6 addresses on a network" } }, -- 2.16.6 From d4d2912f5b8c7f12176ff3304ebbb8f30059f402 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 3 Nov 2017 17:24:19 -0400 Subject: [PATCH 04/16] Fix GENERIC-RESOURCE-API yang model Add missing enum values and container to yang model Also, BRG and tunnelxconn's service instance parent is VNF-API, not GENERIC-RESOURCE-API, so do not try to retrieve service data. Change-Id: I12c977a7e621ce654d0d5d38f8ac8f3ad95487bd Issue-ID: SDNC-166 Signed-off-by: Dan Timoney --- .../resources/generic-resource-api.20161111.json | 693 +++++++++++++++------ .../model/src/main/yang/GENERIC-RESOURCE-API.yang | 29 +- .../northbound/GenericResourceApiProvider.java | 47 +- .../GenericResourceApiSvcLogicServiceClient.java | 17 +- 4 files changed, 543 insertions(+), 243 deletions(-) diff --git a/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json b/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json index 7d39ff07..024a0e35 100644 --- a/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json +++ b/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json @@ -589,6 +589,14 @@ "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP" } }, + { + "in": "body", + "name": "**(config)brg-request-input", + "required": false, + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)brg-request-input-TOP" + } + }, { "in": "body", "name": "**(config)service-information", @@ -839,6 +847,86 @@ "operationId": "PUT-onap-model-information" } }, + "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/brg-request-input": { + "delete": { + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "No response was specified" + } + }, + "operationId": "DELETE-brg-request-input" + }, + "get": { + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "No response was specified", + "schema": { + "$ref": "#/definitions/(config)brg-request-input" + } + } + }, + "operationId": "GET-brg-request-input" + }, + "put": { + "consumes": [ + "application/json", + "application/xml" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + }, + { + "in": "body", + "name": "(config)brg-request-input", + "required": false, + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)brg-request-input-TOP" + } + } + ], + "responses": { + "200": { + "description": "No response was specified", + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)brg-request-input-TOP" + } + } + }, + "operationId": "PUT-brg-request-input" + } + }, "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/request-information": { "delete": { "produces": [ @@ -2562,34 +2650,34 @@ }, { "in": "body", - "name": "**(config)request-information", + "name": "**(config)sdnc-request-header", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" } }, { "in": "body", - "name": "**(config)sdnc-request-header", + "name": "**(config)request-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" } }, { "in": "body", - "name": "**(config)contrail-route-request-input", + "name": "**(config)service-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)contrail-route-request-input-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" } }, { "in": "body", - "name": "**(config)service-information", + "name": "**(config)contrail-route-request-input", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)contrail-route-request-input-TOP" } }, { @@ -3859,18 +3947,18 @@ }, { "in": "body", - "name": "**(config)allotted-resource-identifiers", + "name": "**(config)onap-model-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/contrail-route-topology(config)allotted-resource-identifiers-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/contrail-route-topology(config)onap-model-information-TOP" } }, { "in": "body", - "name": "**(config)onap-model-information", + "name": "**(config)allotted-resource-identifiers", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/contrail-route-topology(config)onap-model-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/contrail-route-allotted-resources/contrail-route-allotted-resource/allotted-resource-data/contrail-route-topology(config)allotted-resource-identifiers-TOP" } }, { @@ -5235,18 +5323,18 @@ }, { "in": "body", - "name": "**(config)vpn-bindings", + "name": "**(config)network-topology-identifier", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)vpn-bindings-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-topology-identifier-TOP" } }, { "in": "body", - "name": "**(config)network-topology-identifier", + "name": "**(config)route-table-reference", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-topology-identifier-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)route-table-reference-TOP" } }, { @@ -5259,10 +5347,10 @@ }, { "in": "body", - "name": "**(config)route-table-reference", + "name": "**(config)vpn-bindings", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)route-table-reference-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)vpn-bindings-TOP" } }, { @@ -6110,18 +6198,18 @@ }, { "in": "body", - "name": "**(config)vnf-parameters", + "name": "**(config)vnf-topology-identifier", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-parameters-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-topology-identifier-TOP" } }, { "in": "body", - "name": "**(config)vnf-topology-identifier", + "name": "**(config)vnf-parameters", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-topology-identifier-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-parameters-TOP" } }, { @@ -8711,18 +8799,18 @@ }, { "in": "body", - "name": "**(config)request-information", + "name": "**(config)sdnc-request-header", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/security-zone-allotted-resources/security-zone-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/security-zone-allotted-resources/security-zone-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" } }, { "in": "body", - "name": "**(config)sdnc-request-header", + "name": "**(config)request-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/security-zone-allotted-resources/security-zone-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/security-zone-allotted-resources/security-zone-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP" } }, { @@ -10902,18 +10990,18 @@ }, { "in": "body", - "name": "**(config)service-request-input", + "name": "**(config)service-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-request-input-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-information-TOP" } }, { "in": "body", - "name": "**(config)service-information", + "name": "**(config)service-request-input", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-request-input-TOP" } } ], @@ -11553,34 +11641,34 @@ }, { "in": "body", - "name": "**(config)request-information", + "name": "**(config)sdnc-request-header", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)request-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)sdnc-request-header-TOP" } }, { "in": "body", - "name": "**(config)sdnc-request-header", + "name": "**(config)request-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)sdnc-request-header-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)request-information-TOP" } }, { "in": "body", - "name": "**(config)service-information", + "name": "**(config)network-request-input", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)service-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)network-request-input-TOP" } }, { "in": "body", - "name": "**(config)network-request-input", + "name": "**(config)service-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)network-request-input-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data(config)service-information-TOP" } }, { @@ -12595,18 +12683,18 @@ }, { "in": "body", - "name": "**(config)network-topology-identifier-structure", + "name": "**(config)network-assignments", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-topology-identifier-structure-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-assignments-TOP" } }, { "in": "body", - "name": "**(config)network-assignments", + "name": "**(config)network-topology-identifier-structure", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-assignments-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-topology-identifier-structure-TOP" } } ], @@ -16654,26 +16742,26 @@ }, { "in": "body", - "name": "**(config)vf-module-information", + "name": "**(config)vnf-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vnf-information-TOP" } }, { "in": "body", - "name": "**(config)vf-module-request-input", + "name": "**(config)vf-module-information", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-request-input-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-information-TOP" } }, { "in": "body", - "name": "**(config)vnf-information", + "name": "**(config)vf-module-request-input", "required": false, "schema": { - "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vnf-information-TOP" + "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-request-input-TOP" } }, { @@ -25892,6 +25980,14 @@ "required": true, "type": "string" }, + { + "in": "body", + "name": "**(config)tunnelxconn-request-input", + "required": false, + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)tunnelxconn-request-input-TOP" + } + }, { "in": "body", "name": "**(config)request-information", @@ -26521,6 +26617,86 @@ "operationId": "PUT-onap-model-information" } }, + "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/tunnelxconn-request-input": { + "delete": { + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "No response was specified" + } + }, + "operationId": "DELETE-tunnelxconn-request-input" + }, + "get": { + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "No response was specified", + "schema": { + "$ref": "#/definitions/(config)tunnelxconn-request-input" + } + } + }, + "operationId": "GET-tunnelxconn-request-input" + }, + "put": { + "consumes": [ + "application/json", + "application/xml" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "path", + "name": "allotted-resource-id", + "required": true, + "type": "string" + }, + { + "in": "body", + "name": "(config)tunnelxconn-request-input", + "required": false, + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)tunnelxconn-request-input-TOP" + } + } + ], + "responses": { + "200": { + "description": "No response was specified", + "schema": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)tunnelxconn-request-input-TOP" + } + } + }, + "operationId": "PUT-tunnelxconn-request-input" + } + }, "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-parameters": { "delete": { "produces": [ @@ -27828,12 +28004,11 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API:brg-wan-ip-address": { - "$ref": "#/definitions/0.3.56.0%p", - "enum": [ - "0.3.56.0%p", - "5cB:e8b%LpL}pp" - ] + "GENERIC-RESOURCE-API:brg-request-input": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-request-input" + }, + "type": "object" }, "GENERIC-RESOURCE-API:request-information": { "items": { @@ -27852,16 +28027,6 @@ "$ref": "#/definitions/GENERIC-RESOURCE-API(config)service-information" }, "type": "object" - }, - "GENERIC-RESOURCE-API:vgmux-bearer-ip": { - "$ref": "#/definitions/1.0.21.6", - "enum": [ - "1.0.21.6", - ":" - ] - }, - "GENERIC-RESOURCE-API:vni": { - "$ref": "#/definitions/Some vni" } }, "type": "object" @@ -28119,12 +28284,11 @@ }, "type": "object" }, - "brg-wan-ip-address": { - "$ref": "#/definitions/27.0.29.2", - "enum": [ - "27.0.29.2", - ":50%{p" - ] + "brg-request-input": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)brg-request-input" + }, + "type": "object" }, "request-information": { "items": { @@ -28143,16 +28307,6 @@ "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information" }, "type": "object" - }, - "vgmux-bearer-ip": { - "$ref": "#/definitions/2.0.0.0%N{", - "enum": [ - "2.0.0.0%N{", - "D::D%NN" - ] - }, - "vni": { - "$ref": "#/definitions/Some vni" } }, "type": "object" @@ -28264,10 +28418,10 @@ "(config)brg-assignmentsPOST": { "properties": { "vbrg-wan-ip": { - "$ref": "#/definitions/4.254.7.5%{L", + "$ref": "#/definitions/0.1.0.242", "enum": [ - "4.254.7.5%{L", - "0a6:" + "0.1.0.242", + "dD1e:%pNL{" ] } }, @@ -28284,6 +28438,24 @@ }, "type": "object" }, + "(config)brg-request-inputPOST": { + "properties": { + "brg-wan-mac-address": { + "$ref": "#/definitions/Some brg-wan-mac-address" + }, + "vgmux-bearer-ip": { + "$ref": "#/definitions/0.36.254.57", + "enum": [ + "0.36.254.57", + "Df:b4%p{" + ] + }, + "vni": { + "$ref": "#/definitions/Some vni" + } + }, + "type": "object" + }, "(config)brg-response-informationPOST": { "properties": { "instance-id": { @@ -28566,11 +28738,11 @@ "(config)interface-route-prefixesPOST": { "properties": { "interface-route-prefix": { - "$ref": "#/definitions/2.178.7.3%{", + "$ref": "#/definitions/1.0.25.1%{", "description": "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes", "enum": [ - "2.178.7.3%{", - ":%N" + "1.0.25.1%{", + ":%{{L{" ] }, "interface-route-prefix-cidr": { @@ -28711,7 +28883,7 @@ "(config)network-ips-v6POST": { "properties": { "ip-address-ipv6": { - "$ref": "#/definitions/B:9", + "$ref": "#/definitions/c:a2", "description": "List of assigned ipv6 addresses on a network" } }, @@ -28720,11 +28892,11 @@ "(config)network-ipsPOST": { "properties": { "ip-address": { - "$ref": "#/definitions/3.1.2.4", + "$ref": "#/definitions/0.52.68.25%}N", "description": "List of assigned ipv4 addresses on a network", "enum": [ - "3.1.2.4", - "C8CE:" + "0.52.68.25%}N", + "EF::" ] } }, @@ -29239,7 +29411,11 @@ "CreateSecurityZoneInstance", "DeleteSecurityZoneInstance", "ActivateDCINetworkInstance", - "DeActivateDCINetworkInstance" + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "request-id": { @@ -29889,20 +30065,20 @@ "$ref": "#/definitions/Some dhcp-start-address" }, "gateway-address": { - "$ref": "#/definitions/1.7.0.5", + "$ref": "#/definitions/9.76.167.68%L{LL{pp{{", "enum": [ - "1.7.0.5", - ":B%}LLp" + "9.76.167.68%L{LL{pp{{", + "12Fe:f" ] }, "ip-version": { "$ref": "#/definitions/Some ip-version" }, "start-address": { - "$ref": "#/definitions/0.0.7.0%{N{", + "$ref": "#/definitions/0.1.12.2", "enum": [ - "0.0.7.0%{N{", - "dce4:::" + "0.1.12.2", + "::DC:2" ] }, "subnet-name": { @@ -29948,27 +30124,27 @@ "(config)tunnelxconn-assignmentsPOST": { "properties": { "vg-ip": { - "$ref": "#/definitions/255.148.0.1%{N", + "$ref": "#/definitions/254.28.9.228", "description": "The Network Controller will assign the VG IP address from local inventory", "enum": [ - "255.148.0.1%{N", - "f:" + "254.28.9.228", + "DF8C:%p" ] }, "vgmux-bearer-ip": { - "$ref": "#/definitions/16.46.115.1", + "$ref": "#/definitions/3.209.28.4", "description": "The Network Controller will look up the vgmux bearer ip from the vgmux vf module", "enum": [ - "16.46.115.1", - ":%{N" + "3.209.28.4", + "fB:%p" ] }, "vgmux-lan-ip": { - "$ref": "#/definitions/1.8.23.91%}pNLLpp", + "$ref": "#/definitions/0.0.123.0", "description": "The Network Controller will look up the vgmux lan ip from the vgmux vg module", "enum": [ - "1.8.23.91%}pNLLpp", - "Ac::" + "0.0.123.0", + ":" ] }, "vni": { @@ -29989,6 +30165,14 @@ }, "type": "object" }, + "(config)tunnelxconn-request-inputPOST": { + "properties": { + "brg-wan-mac-address": { + "$ref": "#/definitions/Some brg-wan-mac-address" + } + }, + "type": "object" + }, "(config)tunnelxconn-response-informationPOST": { "properties": { "instance-id": { @@ -30393,15 +30577,15 @@ "(config)vm-networksPOST": { "properties": { "floating-ip": { - "$ref": "#/definitions/0.0.0.7", + "$ref": "#/definitions/1.0.1.1%{{L", "description": "Floating ipv4 for VMs of a given type on this network", "enum": [ - "0.0.0.7", - ":" + "1.0.1.1%{{L", + "Ad:2F:%p}N" ] }, "floating-ip-v6": { - "$ref": "#/definitions/:2", + "$ref": "#/definitions/9:", "description": "Floating ipv6 for VMs of a given type on this network" }, "interface-route-prefixes": { @@ -31546,9 +31730,6 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API:brg-wan-mac-address": { - "$ref": "#/definitions/Some brg-wan-mac-address" - }, "GENERIC-RESOURCE-API:request-information": { "items": { "$ref": "#/definitions/GENERIC-RESOURCE-API(config)request-information" @@ -31566,6 +31747,12 @@ "$ref": "#/definitions/GENERIC-RESOURCE-API(config)service-information" }, "type": "object" + }, + "GENERIC-RESOURCE-API:tunnelxconn-request-input": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API(config)tunnelxconn-request-input" + }, + "type": "object" } }, "type": "object" @@ -31872,6 +32059,35 @@ }, "type": "object" }, + "GENERIC-RESOURCE-API(config)brg-request-input": { + "properties": { + "GENERIC-RESOURCE-API:brg-wan-mac-address": { + "$ref": "#/definitions/Some brg-wan-mac-address" + }, + "GENERIC-RESOURCE-API:vgmux-bearer-ip": { + "$ref": "#/definitions/0.9.0.0%NNNpN{", + "enum": [ + "0.9.0.0%NNNpN{", + "7:" + ] + }, + "GENERIC-RESOURCE-API:vni": { + "$ref": "#/definitions/Some vni" + } + }, + "type": "object" + }, + "GENERIC-RESOURCE-API(config)brg-request-input-TOP": { + "properties": { + "GENERIC-RESOURCE-API:brg-request-input": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API(config)brg-request-input" + }, + "type": "object" + } + }, + "type": "object" + }, "GENERIC-RESOURCE-API(config)brg-response-information": { "properties": { "GENERIC-RESOURCE-API:instance-id": { @@ -32178,7 +32394,11 @@ "CreateSecurityZoneInstance", "DeleteSecurityZoneInstance", "ActivateDCINetworkInstance", - "DeActivateDCINetworkInstance" + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "GENERIC-RESOURCE-API:request-id": { @@ -32453,6 +32673,25 @@ }, "type": "object" }, + "GENERIC-RESOURCE-API(config)tunnelxconn-request-input": { + "properties": { + "GENERIC-RESOURCE-API:brg-wan-mac-address": { + "$ref": "#/definitions/Some brg-wan-mac-address" + } + }, + "type": "object" + }, + "GENERIC-RESOURCE-API(config)tunnelxconn-request-input-TOP": { + "properties": { + "GENERIC-RESOURCE-API:tunnelxconn-request-input": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API(config)tunnelxconn-request-input" + }, + "type": "object" + } + }, + "type": "object" + }, "GENERIC-RESOURCE-API(config)tunnelxconn-response-information": { "properties": { "GENERIC-RESOURCE-API:instance-id": { @@ -33040,12 +33279,11 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API:brg-wan-ip-address": { - "$ref": "#/definitions/0.3.1.29", - "enum": [ - "0.3.1.29", - "926d:" - ] + "GENERIC-RESOURCE-API:brg-request-input": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)brg-request-input" + }, + "type": "object" }, "GENERIC-RESOURCE-API:request-information": { "items": { @@ -33064,16 +33302,6 @@ "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information" }, "type": "object" - }, - "GENERIC-RESOURCE-API:vgmux-bearer-ip": { - "$ref": "#/definitions/1.85.0.0", - "enum": [ - "1.85.0.0", - "be:" - ] - }, - "GENERIC-RESOURCE-API:vni": { - "$ref": "#/definitions/Some vni" } }, "type": "object" @@ -33184,6 +33412,35 @@ }, "type": "object" }, + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)brg-request-input": { + "properties": { + "GENERIC-RESOURCE-API:brg-wan-mac-address": { + "$ref": "#/definitions/Some brg-wan-mac-address" + }, + "GENERIC-RESOURCE-API:vgmux-bearer-ip": { + "$ref": "#/definitions/26.0.26.7", + "enum": [ + "26.0.26.7", + "A9:cA7" + ] + }, + "GENERIC-RESOURCE-API:vni": { + "$ref": "#/definitions/Some vni" + } + }, + "type": "object" + }, + "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)brg-request-input-TOP": { + "properties": { + "GENERIC-RESOURCE-API:brg-request-input": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)brg-request-input" + }, + "type": "object" + } + }, + "type": "object" + }, "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information": { "properties": { "GENERIC-RESOURCE-API:notification-url": { @@ -33215,7 +33472,11 @@ "CreateSecurityZoneInstance", "DeleteSecurityZoneInstance", "ActivateDCINetworkInstance", - "DeActivateDCINetworkInstance" + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "GENERIC-RESOURCE-API:request-id": { @@ -33448,10 +33709,10 @@ "GENERIC-RESOURCE-API/brg-allotted-resources/brg-allotted-resource/allotted-resource-data/brg-topology(config)brg-assignments": { "properties": { "GENERIC-RESOURCE-API:vbrg-wan-ip": { - "$ref": "#/definitions/1.2.0.2", + "$ref": "#/definitions/1.1.2.2%{{pN", "enum": [ - "1.2.0.2", - "8Cad:8df9" + "1.1.2.2%{{pN", + "d2:b%ppLpNN" ] } }, @@ -33944,7 +34205,11 @@ "CreateSecurityZoneInstance", "DeleteSecurityZoneInstance", "ActivateDCINetworkInstance", - "DeActivateDCINetworkInstance" + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "GENERIC-RESOURCE-API:request-id": { @@ -34747,20 +35012,20 @@ "$ref": "#/definitions/Some dhcp-start-address" }, "GENERIC-RESOURCE-API:gateway-address": { - "$ref": "#/definitions/21.184.2.0", + "$ref": "#/definitions/3.16.94.1", "enum": [ - "21.184.2.0", - "::%pN" + "3.16.94.1", + "DCA6:c" ] }, "GENERIC-RESOURCE-API:ip-version": { "$ref": "#/definitions/Some ip-version" }, "GENERIC-RESOURCE-API:start-address": { - "$ref": "#/definitions/252.2.183.0", + "$ref": "#/definitions/2.7.8.2", "enum": [ - "252.2.183.0", - "aA:d3" + "2.7.8.2", + "3bcB:%L" ] }, "GENERIC-RESOURCE-API:subnet-name": { @@ -35134,20 +35399,20 @@ "$ref": "#/definitions/Some dhcp-start-address" }, "GENERIC-RESOURCE-API:gateway-address": { - "$ref": "#/definitions/192.0.197.0", + "$ref": "#/definitions/1.0.21.50%L", "enum": [ - "192.0.197.0", - "C::0" + "1.0.21.50%L", + "c2Ed:9%N" ] }, "GENERIC-RESOURCE-API:ip-version": { "$ref": "#/definitions/Some ip-version" }, "GENERIC-RESOURCE-API:start-address": { - "$ref": "#/definitions/8.12.3.5%NL}", + "$ref": "#/definitions/119.2.170.2", "enum": [ - "8.12.3.5%NL}", - "fCe9:" + "119.2.170.2", + ":" ] }, "GENERIC-RESOURCE-API:subnet-name": { @@ -35449,15 +35714,15 @@ "GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms(config)vm-networks": { "properties": { "GENERIC-RESOURCE-API:floating-ip": { - "$ref": "#/definitions/0.9.254.2%LL", + "$ref": "#/definitions/0.0.25.54%{NNNL}pLp}", "description": "Floating ipv4 for VMs of a given type on this network", "enum": [ - "0.9.254.2%LL", - ":" + "0.0.25.54%{NNNL}pLp}", + ":%p{L" ] }, "GENERIC-RESOURCE-API:floating-ip-v6": { - "$ref": "#/definitions/3:1d", + "$ref": "#/definitions/DB8:", "description": "Floating ipv6 for VMs of a given type on this network" }, "GENERIC-RESOURCE-API:interface-route-prefixes": { @@ -35517,11 +35782,11 @@ "GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": { "properties": { "GENERIC-RESOURCE-API:interface-route-prefix": { - "$ref": "#/definitions/25.25.49.13%{N", + "$ref": "#/definitions/84.59.6.1%pN{", "description": "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes", "enum": [ - "25.25.49.13%{N", - "f58f:2%}}NppNLpL" + "84.59.6.1%pN{", + "5aFf::" ] }, "GENERIC-RESOURCE-API:interface-route-prefix-cidr": { @@ -35548,11 +35813,11 @@ "GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": { "properties": { "GENERIC-RESOURCE-API:ip-address": { - "$ref": "#/definitions/1.0.4.243%LLLpL}p", + "$ref": "#/definitions/221.2.45.0%}{}", "description": "List of assigned ipv4 addresses on a network", "enum": [ - "1.0.4.243%LLLpL}p", - "d:7:Fb:" + "221.2.45.0%}{}", + "ddAF:C" ] } }, @@ -35572,7 +35837,7 @@ "GENERIC-RESOURCE-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": { "properties": { "GENERIC-RESOURCE-API:ip-address-ipv6": { - "$ref": "#/definitions/Dc6b:", + "$ref": "#/definitions/:", "description": "List of assigned ipv6 addresses on a network" } }, @@ -35995,7 +36260,11 @@ "CreateSecurityZoneInstance", "DeleteSecurityZoneInstance", "ActivateDCINetworkInstance", - "DeActivateDCINetworkInstance" + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "GENERIC-RESOURCE-API:request-id": { @@ -36806,7 +37075,11 @@ "CreateSecurityZoneInstance", "DeleteSecurityZoneInstance", "ActivateDCINetworkInstance", - "DeActivateDCINetworkInstance" + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "GENERIC-RESOURCE-API:request-id": { @@ -37456,7 +37729,11 @@ "CreateSecurityZoneInstance", "DeleteSecurityZoneInstance", "ActivateDCINetworkInstance", - "DeActivateDCINetworkInstance" + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "GENERIC-RESOURCE-API:request-id": { @@ -38165,7 +38442,11 @@ "CreateSecurityZoneInstance", "DeleteSecurityZoneInstance", "ActivateDCINetworkInstance", - "DeActivateDCINetworkInstance" + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "GENERIC-RESOURCE-API:request-id": { @@ -38684,7 +38965,11 @@ "CreateSecurityZoneInstance", "DeleteSecurityZoneInstance", "ActivateDCINetworkInstance", - "DeActivateDCINetworkInstance" + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "GENERIC-RESOURCE-API:request-id": { @@ -39417,10 +39702,10 @@ "GENERIC-RESOURCE-API:floating-ip-v4": { "description": "Floating ipv4 for VMs of a given type on this network", "items": { - "$ref": "#/definitions/6.252.1.9%{LL", + "$ref": "#/definitions/0.255.197.19%}", "enum": [ - "6.252.1.9%{LL", - "B:" + "0.255.197.19%}", + ":DA%p" ] }, "type": "array" @@ -39428,7 +39713,7 @@ "GENERIC-RESOURCE-API:floating-ip-v6": { "description": "Floating ipv6 for VMs of a given type on this network", "items": { - "$ref": "#/definitions/A9e6:2e" + "$ref": "#/definitions/:85:2" }, "type": "array" } @@ -40450,9 +40735,6 @@ }, "type": "object" }, - "GENERIC-RESOURCE-API:brg-wan-mac-address": { - "$ref": "#/definitions/Some brg-wan-mac-address" - }, "GENERIC-RESOURCE-API:request-information": { "items": { "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information" @@ -40470,6 +40752,12 @@ "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information" }, "type": "object" + }, + "GENERIC-RESOURCE-API:tunnelxconn-request-input": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)tunnelxconn-request-input" + }, + "type": "object" } }, "type": "object" @@ -40611,7 +40899,11 @@ "CreateSecurityZoneInstance", "DeleteSecurityZoneInstance", "ActivateDCINetworkInstance", - "DeActivateDCINetworkInstance" + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "GENERIC-RESOURCE-API:request-id": { @@ -40716,6 +41008,25 @@ }, "type": "object" }, + "GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)tunnelxconn-request-input": { + "properties": { + "GENERIC-RESOURCE-API:brg-wan-mac-address": { + "$ref": "#/definitions/Some brg-wan-mac-address" + } + }, + "type": "object" + }, + "GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)tunnelxconn-request-input-TOP": { + "properties": { + "GENERIC-RESOURCE-API:tunnelxconn-request-input": { + "items": { + "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)tunnelxconn-request-input" + }, + "type": "object" + } + }, + "type": "object" + }, "GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information(config)onap-model-information": { "properties": { "GENERIC-RESOURCE-API:model-customization-uuid": { @@ -40878,27 +41189,27 @@ "GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)tunnelxconn-assignments": { "properties": { "GENERIC-RESOURCE-API:vg-ip": { - "$ref": "#/definitions/22.80.15.0%L", + "$ref": "#/definitions/101.112.40.0%NLpNNLp{p", "description": "The Network Controller will assign the VG IP address from local inventory", "enum": [ - "22.80.15.0%L", - "bD4:ca" + "101.112.40.0%NLpNNLp{p", + "5Ede:" ] }, "GENERIC-RESOURCE-API:vgmux-bearer-ip": { - "$ref": "#/definitions/2.204.65.2", + "$ref": "#/definitions/25.0.2.0%LLNp", "description": "The Network Controller will look up the vgmux bearer ip from the vgmux vf module", "enum": [ - "2.204.65.2", - "8ce::" + "25.0.2.0%LLNp", + "A:" ] }, "GENERIC-RESOURCE-API:vgmux-lan-ip": { - "$ref": "#/definitions/2.0.254.1%p", + "$ref": "#/definitions/191.0.17.5%LLpN}{", "description": "The Network Controller will look up the vgmux lan ip from the vgmux vg module", "enum": [ - "2.0.254.1%p", - "FF3b:285" + "191.0.17.5%LLpN}{", + "dbC::" ] }, "GENERIC-RESOURCE-API:vni": { @@ -41489,15 +41800,15 @@ "GENERIC-RESOURCE-API/vnf-topology-information/vnf-assignments/vnf-vms(config)vm-networks": { "properties": { "GENERIC-RESOURCE-API:floating-ip": { - "$ref": "#/definitions/1.25.3.1%L{N{pNLL}}{pL{Lpp}N", + "$ref": "#/definitions/15.16.8.2%L}}{L", "description": "Floating ipv4 for VMs of a given type on this network", "enum": [ - "1.25.3.1%L{N{pNLL}}{pL{Lpp}N", - "3::08B3" + "15.16.8.2%L}}{L", + "3:7b1b:" ] }, "GENERIC-RESOURCE-API:floating-ip-v6": { - "$ref": "#/definitions/cEa:", + "$ref": "#/definitions/cE2c:2b:", "description": "Floating ipv6 for VMs of a given type on this network" }, "GENERIC-RESOURCE-API:interface-route-prefixes": { @@ -41557,11 +41868,11 @@ "GENERIC-RESOURCE-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": { "properties": { "GENERIC-RESOURCE-API:interface-route-prefix": { - "$ref": "#/definitions/3.209.0.0%N}p{", + "$ref": "#/definitions/20.23.0.1", "description": "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes", "enum": [ - "3.209.0.0%N}p{", - ":2%L}" + "20.23.0.1", + ":56Ab:" ] }, "GENERIC-RESOURCE-API:interface-route-prefix-cidr": { @@ -41588,11 +41899,11 @@ "GENERIC-RESOURCE-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": { "properties": { "GENERIC-RESOURCE-API:ip-address": { - "$ref": "#/definitions/0.0.28.122%{", + "$ref": "#/definitions/0.24.0.1", "description": "List of assigned ipv4 addresses on a network", "enum": [ - "0.0.28.122%{", - ":4%L}pL" + "0.24.0.1", + "5F::da6a:f6" ] } }, @@ -41612,7 +41923,7 @@ "GENERIC-RESOURCE-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": { "properties": { "GENERIC-RESOURCE-API:ip-address-ipv6": { - "$ref": "#/definitions/:", + "$ref": "#/definitions/:%}LpLNLLLpL{L{LNN}L}}", "description": "List of assigned ipv6 addresses on a network" } }, diff --git a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang index 6f776287..d82b6305 100644 --- a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang +++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang @@ -806,8 +806,11 @@ module GENERIC-RESOURCE-API { uses tunnelxconn-request-input; } grouping tunnelxconn-request-input { - leaf brg-wan-mac-address { - type string; + + container tunnelxconn-request-input { + leaf brg-wan-mac-address { + type string; + } } } grouping tunnelxconn-topology { @@ -848,14 +851,16 @@ module GENERIC-RESOURCE-API { uses brg-request-input; } grouping brg-request-input { - leaf vgmux-bearer-ip { - type inet:ip-address; - } - leaf vni { - type string; - } - leaf brg-wan-ip-address { - type inet:ip-address; + container brg-request-input { + leaf vgmux-bearer-ip { + type inet:ip-address; + } + leaf vni { + type string; + } + leaf brg-wan-mac-address { + type string; + } } } grouping brg-topology { @@ -1031,6 +1036,10 @@ module GENERIC-RESOURCE-API { enum "DeleteSecurityZoneInstance"; enum "ActivateDCINetworkInstance"; enum "DeActivateDCINetworkInstance"; + enum "CreateTunnelXConnInstance"; + enum "DeleteTunnelXConnInstance"; + enum "CreateBRGInstance"; + enum "DeleteBRGInstance"; } } leaf source { diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java index a747df6f..1e45ee79 100644 --- a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java +++ b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java @@ -1615,7 +1615,7 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC } String siid = input.getServiceInformation().getServiceInstanceId(); - +/* // Get the service-instance service data from MD-SAL ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder(); getServiceData(siid, serviceDataBuilder); @@ -1634,7 +1634,7 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC RpcResult rpcResult = RpcResultBuilder .status(true).withResult(responseBuilder.build()).build(); return Futures.immediateFuture(rpcResult); - } + }*/ log.info("Adding INPUT data for {} [{}] input: {}", SVC_OPERATION, siid, input); TunnelxconnTopologyOperationInputBuilder inputBuilder = new TunnelxconnTopologyOperationInputBuilder(input); @@ -1656,7 +1656,7 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) { try { - respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms); + respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", parms); } catch (Exception e) { log.error("Caught exception executing service logic for {}", SVC_OPERATION, e); errorMessage = e.getMessage(); @@ -1696,24 +1696,7 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC // Got success from SLI try { - serviceData = serviceDataBuilder.build(); - log.info("Updating MD-SAL for {} [{}] ServiceData: {}", SVC_OPERATION, siid, serviceData); - // service object - ServiceBuilder serviceBuilder = new ServiceBuilder(); - serviceBuilder.setServiceData(serviceData); - serviceBuilder.setServiceInstanceId(siid); - serviceBuilder.setServiceStatus(serviceStatusBuilder.build()); - saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION); - - if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) { - // Only update operational tree on activate or delete - if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign) - || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) { - log.info("Updating OPERATIONAL tree."); - saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL); - } - } TunnelxconnResponseInformationBuilder tunnelxconnResponseInformationBuilder = new TunnelxconnResponseInformationBuilder(); tunnelxconnResponseInformationBuilder.setInstanceId(allottedResourceId); @@ -1775,7 +1758,7 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC String siid = input.getServiceInformation().getServiceInstanceId(); - // Get the service-instance service data from MD-SAL +/* // Get the service-instance service data from MD-SAL ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder(); getServiceData(siid, serviceDataBuilder); @@ -1793,7 +1776,7 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC RpcResult rpcResult = RpcResultBuilder.status(true) .withResult(responseBuilder.build()).build(); return Futures.immediateFuture(rpcResult); - } + }*/ log.info("Adding INPUT data for {} [{}] input: {}", SVC_OPERATION, siid, input); BrgTopologyOperationInputBuilder inputBuilder = new BrgTopologyOperationInputBuilder(input); @@ -1815,7 +1798,7 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) { try { - respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms); + respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", parms); } catch (Exception e) { log.error("Caught exception executing service logic for {}", SVC_OPERATION, e); errorMessage = e.getMessage(); @@ -1855,24 +1838,6 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC // Got success from SLI try { - serviceData = serviceDataBuilder.build(); - log.info("Updating MD-SAL for {} [{}] ServiceData: {}", SVC_OPERATION, siid, serviceData); - - // service object - ServiceBuilder serviceBuilder = new ServiceBuilder(); - serviceBuilder.setServiceData(serviceData); - serviceBuilder.setServiceInstanceId(siid); - serviceBuilder.setServiceStatus(serviceStatusBuilder.build()); - saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION); - - if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) { - // Only update operational tree on activate or delete - if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign) - || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) { - log.info("Updating OPERATIONAL tree."); - saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL); - } - } BrgResponseInformationBuilder brgResponseInformationBuilder = new BrgResponseInformationBuilder(); brgResponseInformationBuilder.setInstanceId(allottedResourceId); diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiSvcLogicServiceClient.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiSvcLogicServiceClient.java index 8ba70dee..b000ed47 100644 --- a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiSvcLogicServiceClient.java +++ b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiSvcLogicServiceClient.java @@ -1,5 +1,5 @@ /*- - * ============LICENSE_START======================================================= +z * ============LICENSE_START======================================================= * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights @@ -106,6 +106,21 @@ public class GenericResourceApiSvcLogicServiceClient { return respProps; } + public Properties execute(String module, String rpc, String version, String mode, Properties properties) + throws SvcLogicException { + + printPropsDebugLogs(properties, "Parameters passed to SLI"); + + Properties respProps = svcLogic.execute(module, rpc, version, mode, properties); + printPropsDebugLogs(respProps, "Parameters returned by SLI"); + if (respProps == null || FAILURE_RESULT.equalsIgnoreCase(respProps.getProperty(SVC_LOGIC_STATUS_KEY))) { + return (respProps); + } + + return respProps; + } + + private void printPropsDebugLogs(Properties properties, String msg) { if (!LOG.isDebugEnabled()) { return; -- 2.16.6 From f9fa722e44042ae612d3a2103f355d6199034978 Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Sat, 4 Nov 2017 12:22:35 -0700 Subject: [PATCH 05/16] Add DG actions to last-action in GenRes.API Yang Issue-Id: SDNC-171 Change-Id: I913a40c604f9cab4d9eb1be56c53b69aefc4a3bf Signed-off-by: Marcus G K Williams --- .../model/src/main/resources/generic-resource-api.20161111.json | 8 +++++++- .../model/src/main/yang/GENERIC-RESOURCE-API.yang | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json b/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json index 024a0e35..5f5096fa 100644 --- a/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json +++ b/generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json @@ -28226,7 +28226,13 @@ "CreateContrailRouteInstance", "DeleteContrailRouteInstance", "CreateSecurityZoneInstance", - "DeleteSecurityZoneInstance" + "DeleteSecurityZoneInstance", + "ActivateDCINetworkInstance", + "DeActivateDCINetworkInstance", + "CreateTunnelXConnInstance", + "DeleteTunnelXConnInstance", + "CreateBRGInstance", + "DeleteBRGInstance" ] }, "last-order-status": { diff --git a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang index d82b6305..3b751b13 100644 --- a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang +++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang @@ -1176,6 +1176,12 @@ module GENERIC-RESOURCE-API { enum "DeleteContrailRouteInstance"; enum "CreateSecurityZoneInstance"; enum "DeleteSecurityZoneInstance"; + enum "ActivateDCINetworkInstance"; + enum "DeActivateDCINetworkInstance"; + enum "CreateTunnelXConnInstance"; + enum "DeleteTunnelXConnInstance"; + enum "CreateBRGInstance"; + enum "DeleteBRGInstance"; } } leaf last-svc-request-id { -- 2.16.6 From 89777caa13e1b150fc9fc902039d03561968b8fe Mon Sep 17 00:00:00 2001 From: Morgan Richomme Date: Wed, 8 Nov 2017 17:20:49 +0100 Subject: [PATCH 06/16] fix doc8 error JIRA: SDNC-178 Change-Id: If5fe5ef8564eb8f673b95b058159c8259722c59f Signed-off-by: Morgan Richomme --- docs/release-notes.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index b4516570..21ff338c 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -43,4 +43,3 @@ One or two sentences explaining the purpose of this Release. **Other** -=========== \ No newline at end of file -- 2.16.6 From 9c6a1f08827e2183e5410c82f0fb2941b83918db Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 9 Nov 2017 07:53:04 -0500 Subject: [PATCH 07/16] Roll to version 1.2.1-SNAPSHOT Roll to next release version Change-Id: Id1d521317ca37583ed28b2bf60b0411120f13e00 Issue-ID: SDNC-74 Signed-off-by: Dan Timoney --- generic-resource-api/features/pom.xml | 2 +- generic-resource-api/installer/pom.xml | 2 +- generic-resource-api/model/pom.xml | 2 +- generic-resource-api/pom.xml | 4 ++-- generic-resource-api/provider/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- vnfapi/features/pom.xml | 2 +- vnfapi/installer/pom.xml | 2 +- vnfapi/model/pom.xml | 2 +- vnfapi/pom.xml | 4 ++-- vnfapi/provider/pom.xml | 2 +- vnftools/features/pom.xml | 2 +- vnftools/installer/pom.xml | 2 +- vnftools/pom.xml | 4 ++-- vnftools/provider/pom.xml | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml index 041307fc..b8466eba 100644 --- a/generic-resource-api/features/pom.xml +++ b/generic-resource-api/features/pom.xml @@ -6,7 +6,7 @@ org.onap.sdnc.northbound generic-resource-api - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT generic-resource-api-features diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index e1f2d513..6aaec113 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -5,7 +5,7 @@ generic-resource-api org.onap.sdnc.northbound - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT generic-resource-api-installer Generic Resource API - Karaf Installer diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index f0bf6b9e..c2fbf7cc 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.northbound generic-resource-api - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT generic-resource-api-model diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index f3c2e937..c986c22d 100644 --- a/generic-resource-api/pom.xml +++ b/generic-resource-api/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.northbound sdnc-northbound - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT org.onap.sdnc.northbound generic-resource-api - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT pom diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml index ae1782c8..3a788b0d 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.northbound generic-resource-api - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT generic-resource-api-provider diff --git a/pom.xml b/pom.xml index 5fc42cfd..cff8e7b2 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ ONAP - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT diff --git a/version.properties b/version.properties index 9bf927d7..1291f242 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=1 sprint_number=2 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml index 781328ff..7ba644c5 100644 --- a/vnfapi/features/pom.xml +++ b/vnfapi/features/pom.xml @@ -4,7 +4,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT vnfapi-features diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index ab174926..3192ab20 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -5,7 +5,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT vnfapi-installer VNF API - Karaf Installer diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml index 1c83424d..4211b7f5 100644 --- a/vnfapi/model/pom.xml +++ b/vnfapi/model/pom.xml @@ -4,7 +4,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT vnfapi-model bundle diff --git a/vnfapi/pom.xml b/vnfapi/pom.xml index 2b0f53aa..0dafd494 100644 --- a/vnfapi/pom.xml +++ b/vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.sdnc.northbound sdnc-northbound - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT pom org.onap.sdnc.northbound vnfapi - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT vnfapi diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml index e373b69f..5296a131 100644 --- a/vnfapi/provider/pom.xml +++ b/vnfapi/provider/pom.xml @@ -4,7 +4,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT vnfapi-provider bundle diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml index 452737fa..d6d757ed 100644 --- a/vnftools/features/pom.xml +++ b/vnftools/features/pom.xml @@ -4,7 +4,7 @@ vnftools org.onap.sdnc.northbound - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT vnftools-features VNF tools Plugin - Features diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index 196b6bd8..e46a7d1b 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -5,7 +5,7 @@ vnftools org.onap.sdnc.northbound - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT vnftools-installer VNF Tools Plugin - Karaf Installer diff --git a/vnftools/pom.xml b/vnftools/pom.xml index c9ed9790..cb7522d7 100644 --- a/vnftools/pom.xml +++ b/vnftools/pom.xml @@ -3,7 +3,7 @@ org.onap.sdnc.northbound sdnc-northbound - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ VNF Tools Plugin Provides execute nodes to Directed Graphs that use the VNF Module. - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml index e0cd5b4e..ddf6cb3e 100644 --- a/vnftools/provider/pom.xml +++ b/vnftools/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.northbound vnftools - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT vnftools-provider bundle -- 2.16.6 From cf7b1f410a2776c4323e995863559982d54895fe Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Tue, 14 Nov 2017 13:31:01 -0800 Subject: [PATCH 08/16] Fix preload-network-topology-operation err msgs Issue-Id: SDNC-145 Change-Id: Ibf4fe3101b278ad3dee7632863eb10f4b4c88e48 Signed-off-by: Marcus G K Williams --- .../main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java | 17 +++++++++-------- .../java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java | 8 ++++---- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java index 28daac27..e8a9e716 100644 --- a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java +++ b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java @@ -1800,9 +1800,9 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL || input.getVnfTopologyInformation().getVnfTopologyIdentifier() == null || input.getVnfTopologyInformation().getVnfTopologyIdentifier().getVnfName() == null || input.getVnfTopologyInformation().getVnfTopologyIdentifier().getVnfType() == null) { - log.debug("exiting " + SVC_OPERATION + " because of invalid input, null or empty vnf-name and vnf-type"); + log.debug("exiting " + SVC_OPERATION + " because of invalid input, null or empty vnf-name or vnf-type"); responseBuilder.setResponseCode("403"); - responseBuilder.setResponseMessage("invalid input, null or empty vnf-name and vnf-type"); + responseBuilder.setResponseMessage("invalid input, null or empty vnf-name or vnf-type"); responseBuilder.setAckFinalIndicator("Y"); RpcResult rpcResult = RpcResultBuilder.status(true).withResult(responseBuilder.build()) @@ -1997,9 +1997,9 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL || input.getVnfInstanceTopologyInformation().getVnfInstanceIdentifiers().getVnfInstanceName() == null || input.getVnfInstanceTopologyInformation().getVnfInstanceIdentifiers().getVnfModelId() == null) { log.debug("exiting " + SVC_OPERATION - + " because of invalid input, null or empty vnf-instance-name and vnf-model-id"); + + " because of invalid input, null or empty vnf-instance-name or vnf-model-id"); responseBuilder.setResponseCode("403"); - responseBuilder.setResponseMessage("invalid input, null or empty vnf-instance-name and vnf-model-id"); + responseBuilder.setResponseMessage("invalid input, null or empty vnf-instance-name or vnf-model-id"); responseBuilder.setAckFinalIndicator("Y"); RpcResult rpcResult = RpcResultBuilder.status(true) @@ -2199,9 +2199,9 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL || input.getVfModuleTopologyInformation().getVfModuleIdentifiers().getVfModuleName() == null || input.getVfModuleTopologyInformation().getVfModuleIdentifiers().getVfModuleModelId() == null) { log.debug("exiting " + SVC_OPERATION - + " because of invalid input, null or empty vnf-instance-name and vnf-model-id"); + + " because of invalid input, null or empty vf-module-name or vf-module-model-id"); responseBuilder.setResponseCode("403"); - responseBuilder.setResponseMessage("invalid input, null or empty vnf-instance-name and vnf-model-id"); + responseBuilder.setResponseMessage("invalid input, null or empty vf-module-name or vf-module-model-id"); responseBuilder.setAckFinalIndicator("Y"); RpcResult rpcResult = RpcResultBuilder.status(true) @@ -2397,9 +2397,10 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL || input.getNetworkTopologyInformation().getNetworkTopologyIdentifier() == null || input.getNetworkTopologyInformation().getNetworkTopologyIdentifier().getNetworkName() == null || input.getNetworkTopologyInformation().getNetworkTopologyIdentifier().getNetworkType() == null) { - log.debug("exiting " + SVC_OPERATION + " because of invalid input, null or empty vnf-name and vnf-type"); + log.debug("exiting " + SVC_OPERATION + " because of invalid input, null or" + + " empty network-name or network-type"); responseBuilder.setResponseCode("403"); - responseBuilder.setResponseMessage("input, null or empty vnf-name and vnf-type"); + responseBuilder.setResponseMessage("input, null or empty network-name or network-type"); responseBuilder.setAckFinalIndicator("Y"); RpcResult rpcResult = RpcResultBuilder.status(true).withResult(responseBuilder.build()) diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java index 5ea0c119..88b73e00 100644 --- a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java @@ -738,7 +738,7 @@ public class vnfapiProviderTest { vnfapiProvider.preloadVnfTopologyOperation(preloadVnfTopologyOperationInput); Assert.assertEquals("403", rpcResultFuture.get().getResult().getResponseCode()); - Assert.assertEquals("invalid input, null or empty vnf-name and vnf-type", + Assert.assertEquals("invalid input, null or empty vnf-name or vnf-type", rpcResultFuture.get().getResult().getResponseMessage()); Assert.assertEquals("Y", rpcResultFuture.get().getResult().getAckFinalIndicator()); } @@ -863,7 +863,7 @@ public class vnfapiProviderTest { vnfapiProvider.preloadVnfInstanceTopologyOperation(preloadVnfInstanceTopologyOperationInput); Assert.assertEquals("403", rpcResultFuture.get().getResult().getResponseCode()); - Assert.assertEquals("invalid input, null or empty vnf-instance-name and vnf-model-id", + Assert.assertEquals("invalid input, null or empty vnf-instance-name or vnf-model-id", rpcResultFuture.get().getResult().getResponseMessage()); Assert.assertEquals("Y", rpcResultFuture.get().getResult().getAckFinalIndicator()); } @@ -993,7 +993,7 @@ public class vnfapiProviderTest { vnfapiProvider.preloadVfModuleTopologyOperation(preloadVnfTopologyOperationInput); Assert.assertEquals("403", rpcResultFuture.get().getResult().getResponseCode()); - Assert.assertEquals("invalid input, null or empty vnf-instance-name and vnf-model-id", + Assert.assertEquals("invalid input, null or empty vf-module-name or vf-module-model-id", rpcResultFuture.get().getResult().getResponseMessage()); Assert.assertEquals("Y", rpcResultFuture.get().getResult().getAckFinalIndicator()); } @@ -1120,7 +1120,7 @@ public class vnfapiProviderTest { vnfapiProvider.preloadNetworkTopologyOperation(PreloadNetworkTopologyOperationInput); Assert.assertEquals("403", rpcResultFuture.get().getResult().getResponseCode()); - Assert.assertEquals("input, null or empty vnf-name and vnf-type", + Assert.assertEquals("input, null or empty network-name or network-type", rpcResultFuture.get().getResult().getResponseMessage()); Assert.assertEquals("Y", rpcResultFuture.get().getResult().getAckFinalIndicator()); } -- 2.16.6 From 4a858d878b4aaa746a27d1d7568922f853dc0d2d Mon Sep 17 00:00:00 2001 From: Rich Bennett Date: Wed, 15 Nov 2017 08:19:14 -0500 Subject: [PATCH 09/16] Rm docs in repo consolidated w/ sdnc/oam Change-Id: I3e6d9b04c3ce814597d1d3992f947b87d1757f61 Issue-ID: DOC-124 Signed-off-by: Rich Bennett --- docs/apis/genericresource.rst | 4 ---- docs/apis/vnfapi.rst | 4 ---- docs/architecture.rst | 11 ----------- docs/build.rst | 18 ----------------- docs/index.rst | 13 ------------- docs/logging.rst | 14 -------------- docs/offeredapis.rst | 10 ---------- docs/release-notes.rst | 45 ------------------------------------------- 8 files changed, 119 deletions(-) delete mode 100644 docs/apis/genericresource.rst delete mode 100644 docs/apis/vnfapi.rst delete mode 100644 docs/architecture.rst delete mode 100644 docs/build.rst delete mode 100644 docs/index.rst delete mode 100644 docs/logging.rst delete mode 100644 docs/offeredapis.rst delete mode 100644 docs/release-notes.rst diff --git a/docs/apis/genericresource.rst b/docs/apis/genericresource.rst deleted file mode 100644 index 11a165f1..00000000 --- a/docs/apis/genericresource.rst +++ /dev/null @@ -1,4 +0,0 @@ -GENERIC-RESOURCE-API(2016-11-11) -================================ - -.. swaggerv2doc:: https://gerrit.onap.org/r/gitweb?p=sdnc/northbound.git;a=blob_plain;f=generic-resource-api/model/src/main/resources/generic-resource-api.20161111.json diff --git a/docs/apis/vnfapi.rst b/docs/apis/vnfapi.rst deleted file mode 100644 index 2595a09c..00000000 --- a/docs/apis/vnfapi.rst +++ /dev/null @@ -1,4 +0,0 @@ -VNF-API(2015-07-20) -=================== - -.. swaggerv2doc:: https://gerrit.onap.org/r/gitweb?p=sdnc/northbound.git;a=blob_plain;f=vnfapi/model/src/main/resources/vnf-api.20150720.json \ No newline at end of file diff --git a/docs/architecture.rst b/docs/architecture.rst deleted file mode 100644 index 34022e5b..00000000 --- a/docs/architecture.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 - -Architecture -============ - - -Capabilities ------------- -This repository contains the source code and Yang models for the SDNC northbound REST interfaces -(GENERIC-RESOURCE-API and VNF-API) diff --git a/docs/build.rst b/docs/build.rst deleted file mode 100644 index 0a4c308e..00000000 --- a/docs/build.rst +++ /dev/null @@ -1,18 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 - -Build -===== - - -Environment ------------ -Requires maven release 3.3 or greater - -Steps ------ -To compile this code: - -1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the ONAP repositories and OpenDaylight repositories. - -2. To compile, run "mvn clean install". \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst deleted file mode 100644 index 2055f178..00000000 --- a/docs/index.rst +++ /dev/null @@ -1,13 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. - -CCSDK Service Logic Interpreter -------------------------------- -.. toctree:: - :maxdepth: 1 - - architecture.rst - offeredapis.rst - logging.rst - build.rst - release-notes.rst - diff --git a/docs/logging.rst b/docs/logging.rst deleted file mode 100644 index 187eb03b..00000000 --- a/docs/logging.rst +++ /dev/null @@ -1,14 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 - -Logging -======= -CCSDK uses slf4j to log messages to the standard OpenDaylight karaf.log -log file. - -Where to Access Information ---------------------------- -Logs are found within the SDNC docker container, in the directory -/opt/opendaylight/current/data/logs. - - diff --git a/docs/offeredapis.rst b/docs/offeredapis.rst deleted file mode 100644 index c79cb977..00000000 --- a/docs/offeredapis.rst +++ /dev/null @@ -1,10 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. - - -Offered APIs -============ -.. toctree:: - :maxdepth: 1 - - apis/genericresource.rst - apis/vnfapi.rst diff --git a/docs/release-notes.rst b/docs/release-notes.rst deleted file mode 100644 index 21ff338c..00000000 --- a/docs/release-notes.rst +++ /dev/null @@ -1,45 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. - -Release Notes -============= - -.. note:: - * This Release Notes must be updated each time the team decides to Release new artifacts. - * The scope of this Release Notes is for this particular component. In other words, each ONAP component has its Release Notes. - * This Release Notes is cumulative, the most recently Released artifact is made visible in the top of this Release Notes. - * Except the date and the version number, all the other sections are optional but there must be at least one section describing the purpose of this new release. - * This note must be removed after content has been added. - - -Version: x.y.z --------------- - - -:Release Date: yyyy-mm-dd - - - -**New Features** - -One or two sentences explaining the purpose of this Release. - -**Bug Fixes** - - `CIMAN-65 `_ and a sentence explaining what this defect is addressing. -**Known Issues** - - `CIMAN-65 `_ and two, three sentences. - One sentences explaining what is the issue. - - Another sentence explaining the impact of the issue. - - And an optional sentence providing a workaround. - -**Security Issues** - You may want to include a reference to CVE (Common Vulnerabilities and Exposures) `CVE `_ - - -**Upgrade Notes** - -**Deprecation Notes** - -**Other** - -- 2.16.6 From 0d82295193356e29a27caded94961c412275c953 Mon Sep 17 00:00:00 2001 From: "ramu.n" Date: Wed, 15 Nov 2017 21:24:44 +0530 Subject: [PATCH 10/16] Fix VoLTE service delete issue In VoLTE use case underlay uses network-topology-operation with svc-action create & delete, during underlay create operation need to update MDSAL OPERATIONAL data store similar to network-topology-operation with activate. Change-Id: I312679244656b4bef514595d1ec724969d44d38f Issue-Id: SDNC-193 Signed-off-by: Ramu N --- .../main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java index 1e45ee79..63df654f 100644 --- a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java +++ b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java @@ -1226,7 +1226,8 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) { // Only update operational tree on Activate - if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) { + if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate) + || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Create)) { log.info("Updating OPERATIONAL tree."); saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL); } -- 2.16.6 From acf2311a4d2f646a6e01af325b00b7d68e135225 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 15 Nov 2017 12:06:42 -0500 Subject: [PATCH 11/16] Roll to next version Since release 1.2.1 has already been cut, need to bump version to 1.2.2-SNAPSHOT. Change-Id: I97f293f264082d78d15984c231b67759c3e1006b Issue-ID: SDNC-74 Signed-off-by: Dan Timoney --- generic-resource-api/features/pom.xml | 2 +- generic-resource-api/installer/pom.xml | 2 +- generic-resource-api/model/pom.xml | 2 +- generic-resource-api/pom.xml | 4 ++-- generic-resource-api/provider/pom.xml | 2 +- pom.xml | 2 +- vnfapi/features/pom.xml | 2 +- vnfapi/installer/pom.xml | 2 +- vnfapi/model/pom.xml | 2 +- vnfapi/pom.xml | 4 ++-- vnfapi/provider/pom.xml | 2 +- vnftools/features/pom.xml | 2 +- vnftools/installer/pom.xml | 2 +- vnftools/pom.xml | 4 ++-- vnftools/provider/pom.xml | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml index b8466eba..bd8f1031 100644 --- a/generic-resource-api/features/pom.xml +++ b/generic-resource-api/features/pom.xml @@ -6,7 +6,7 @@ org.onap.sdnc.northbound generic-resource-api - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT generic-resource-api-features diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index 6aaec113..34b2e388 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -5,7 +5,7 @@ generic-resource-api org.onap.sdnc.northbound - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT generic-resource-api-installer Generic Resource API - Karaf Installer diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index c2fbf7cc..431b5f1d 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.northbound generic-resource-api - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT generic-resource-api-model diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index c986c22d..6505941d 100644 --- a/generic-resource-api/pom.xml +++ b/generic-resource-api/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.northbound sdnc-northbound - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.onap.sdnc.northbound generic-resource-api - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT pom diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml index 3a788b0d..5f209647 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.northbound generic-resource-api - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT generic-resource-api-provider diff --git a/pom.xml b/pom.xml index cff8e7b2..90165ca4 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ ONAP - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml index 7ba644c5..5a5e5615 100644 --- a/vnfapi/features/pom.xml +++ b/vnfapi/features/pom.xml @@ -4,7 +4,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT vnfapi-features diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index 3192ab20..c786f0f2 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -5,7 +5,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT vnfapi-installer VNF API - Karaf Installer diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml index 4211b7f5..1e996393 100644 --- a/vnfapi/model/pom.xml +++ b/vnfapi/model/pom.xml @@ -4,7 +4,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT vnfapi-model bundle diff --git a/vnfapi/pom.xml b/vnfapi/pom.xml index 0dafd494..916a8233 100644 --- a/vnfapi/pom.xml +++ b/vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.sdnc.northbound sdnc-northbound - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT pom org.onap.sdnc.northbound vnfapi - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT vnfapi diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml index 5296a131..7f049d72 100644 --- a/vnfapi/provider/pom.xml +++ b/vnfapi/provider/pom.xml @@ -4,7 +4,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT vnfapi-provider bundle diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml index d6d757ed..070ff404 100644 --- a/vnftools/features/pom.xml +++ b/vnftools/features/pom.xml @@ -4,7 +4,7 @@ vnftools org.onap.sdnc.northbound - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT vnftools-features VNF tools Plugin - Features diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index e46a7d1b..a85b478c 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -5,7 +5,7 @@ vnftools org.onap.sdnc.northbound - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT vnftools-installer VNF Tools Plugin - Karaf Installer diff --git a/vnftools/pom.xml b/vnftools/pom.xml index cb7522d7..0bbaccdc 100644 --- a/vnftools/pom.xml +++ b/vnftools/pom.xml @@ -3,7 +3,7 @@ org.onap.sdnc.northbound sdnc-northbound - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ VNF Tools Plugin Provides execute nodes to Directed Graphs that use the VNF Module. - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml index ddf6cb3e..63fb0bd7 100644 --- a/vnftools/provider/pom.xml +++ b/vnftools/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.northbound vnftools - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT vnftools-provider bundle -- 2.16.6 From 3f083b11774858907a358a2736caed53090ae555 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 15 Nov 2017 17:13:53 -0500 Subject: [PATCH 12/16] Update version.properties Fix version in version.properties to 1.2.2 Change-Id: I8f2f71f3dac9dc462cff969b2c666c961d3e978a Issue-ID: SDNC-79 Signed-off-by: Dan Timoney --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 1291f242..b00af220 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=1 sprint_number=2 -feature_revision=1 +feature_revision=2 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6 From 1240ccff36e26154de009bb16a024e221566fb80 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Mon, 20 Nov 2017 11:04:57 -0800 Subject: [PATCH 13/16] Bump minor version Bump minor version in preparation for Amsterdam branching. Change-Id: If5ef8fc3ffb6c819d1c3b8eed0922729997243ef Issue-ID: CIMAN-120 Signed-off-by: Jessica Wagantall --- generic-resource-api/features/pom.xml | 2 +- generic-resource-api/installer/pom.xml | 2 +- generic-resource-api/model/pom.xml | 2 +- generic-resource-api/pom.xml | 4 ++-- generic-resource-api/provider/pom.xml | 2 +- pom.xml | 2 +- version.properties | 4 ++-- vnfapi/features/pom.xml | 2 +- vnfapi/installer/pom.xml | 2 +- vnfapi/model/pom.xml | 2 +- vnfapi/pom.xml | 4 ++-- vnfapi/provider/pom.xml | 2 +- vnftools/features/pom.xml | 2 +- vnftools/installer/pom.xml | 2 +- vnftools/pom.xml | 4 ++-- vnftools/provider/pom.xml | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml index bd8f1031..8b3e0e49 100644 --- a/generic-resource-api/features/pom.xml +++ b/generic-resource-api/features/pom.xml @@ -6,7 +6,7 @@ org.onap.sdnc.northbound generic-resource-api - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT generic-resource-api-features diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index 34b2e388..e3ca5eb8 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -5,7 +5,7 @@ generic-resource-api org.onap.sdnc.northbound - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT generic-resource-api-installer Generic Resource API - Karaf Installer diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index 431b5f1d..701b5163 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.northbound generic-resource-api - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT generic-resource-api-model diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index 6505941d..7696de8a 100644 --- a/generic-resource-api/pom.xml +++ b/generic-resource-api/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.northbound sdnc-northbound - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml index 5f209647..4d82ec99 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.northbound generic-resource-api - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT generic-resource-api-provider diff --git a/pom.xml b/pom.xml index 90165ca4..247fd676 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ ONAP - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT diff --git a/version.properties b/version.properties index b00af220..1dcc37c2 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support release_name=1 -sprint_number=2 -feature_revision=2 +sprint_number=3 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml index 5a5e5615..f8e78914 100644 --- a/vnfapi/features/pom.xml +++ b/vnfapi/features/pom.xml @@ -4,7 +4,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vnfapi-features diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index c786f0f2..a3fc6350 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -5,7 +5,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vnfapi-installer VNF API - Karaf Installer diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml index 1e996393..da38b467 100644 --- a/vnfapi/model/pom.xml +++ b/vnfapi/model/pom.xml @@ -4,7 +4,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vnfapi-model bundle diff --git a/vnfapi/pom.xml b/vnfapi/pom.xml index 916a8233..17403b05 100644 --- a/vnfapi/pom.xml +++ b/vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.sdnc.northbound sdnc-northbound - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom org.onap.sdnc.northbound vnfapi - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vnfapi diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml index 7f049d72..aac430a3 100644 --- a/vnfapi/provider/pom.xml +++ b/vnfapi/provider/pom.xml @@ -4,7 +4,7 @@ vnfapi org.onap.sdnc.northbound - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vnfapi-provider bundle diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml index 070ff404..e16e2db7 100644 --- a/vnftools/features/pom.xml +++ b/vnftools/features/pom.xml @@ -4,7 +4,7 @@ vnftools org.onap.sdnc.northbound - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vnftools-features VNF tools Plugin - Features diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index a85b478c..134fb1ff 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -5,7 +5,7 @@ vnftools org.onap.sdnc.northbound - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vnftools-installer VNF Tools Plugin - Karaf Installer diff --git a/vnftools/pom.xml b/vnftools/pom.xml index 0bbaccdc..1e58c729 100644 --- a/vnftools/pom.xml +++ b/vnftools/pom.xml @@ -3,7 +3,7 @@ org.onap.sdnc.northbound sdnc-northbound - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ VNF Tools Plugin Provides execute nodes to Directed Graphs that use the VNF Module. - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml index 63fb0bd7..29ca7198 100644 --- a/vnftools/provider/pom.xml +++ b/vnftools/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.northbound vnftools - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vnftools-provider bundle -- 2.16.6 From 69453d796578d46f1c0b98964b3a786718a86863 Mon Sep 17 00:00:00 2001 From: Joey Sullivan Date: Wed, 22 Nov 2017 21:22:02 +0000 Subject: [PATCH 14/16] Deleting missing vnf-list entry cause infiniteLoop Deleting a vnf-list entry that does not exist from the databoker throws a ModifiedNodeDoesNotExistException. This conflicted with the optimistic locking retry mechanism causing a infinite loop. Change-Id: I216a31eabf710ed365c8d928e4df0e866848eeca Issue-ID: SDNC-156 Signed-off-by: Joey Sullivan --- vnfapi/provider/pom.xml | 30 ++++ .../java/org/onap/sdnc/vnfapi/vnfapiProvider.java | 25 +-- .../org/onap/sdnc/vnfapi/VnfApiProviderTest.java | 75 +++++++++ .../sdnc/vnfapi/VnfTopologyOperationRPCTest.java | 174 +++++++++++++++++++++ .../org/onap/sdnc/vnfapi/util/DataBrokerUtil.java | 94 +++++++++++ .../java/org/onap/sdnc/vnfapi/util/MDSALUtil.java | 113 +++++++++++++ .../org/onap/sdnc/vnfapi/util/PropBuilder.java | 62 ++++++++ .../util/VNFSDNSvcLogicServiceClientMockUtil.java | 130 +++++++++++++++ 8 files changed, 692 insertions(+), 11 deletions(-) create mode 100644 vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java create mode 100644 vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfTopologyOperationRPCTest.java create mode 100644 vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/DataBrokerUtil.java create mode 100644 vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/MDSALUtil.java create mode 100644 vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/PropBuilder.java create mode 100644 vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/VNFSDNSvcLogicServiceClientMockUtil.java diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml index aac430a3..35021adb 100644 --- a/vnfapi/provider/pom.xml +++ b/vnfapi/provider/pom.xml @@ -60,6 +60,36 @@ sli-provider ${sdnctl.sli.version} + + + org.opendaylight.controller + sal-test-model + ${odl.mdsal.version} + test + + + org.opendaylight.netconf + sal-rest-connector + ${odl.mdsal.version} + test + + + + org.opendaylight.controller + sal-binding-broker-impl + ${odl.mdsal.version} + test + + + org.opendaylight.controller + sal-binding-broker-impl + ${odl.mdsal.version} + test-jar + tests + test + + + junit junit diff --git a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java index e8a9e716..30f85859 100644 --- a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java +++ b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java @@ -771,30 +771,33 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL InstanceIdentifier.builder(Vnfs.class).child(VnfList.class, entry.getKey()); InstanceIdentifier path = vnfListIdBuilder.build(); - int tries = 2; - while (true) { + int optimisticLockTries = 2; + boolean tryAgain =true; + while (tryAgain) { + tryAgain = false; try { WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); tx.delete(storeType, path); tx.submit().checkedGet(); log.debug("DataStore delete succeeded"); - break; } catch (final TransactionCommitFailedException e) { if (e instanceof OptimisticLockFailedException) { - if (--tries <= 0) { + if (--optimisticLockTries <= 0) { log.debug("Got OptimisticLockFailedException on last try - failing "); throw new IllegalStateException(e); } log.debug("Got OptimisticLockFailedException - trying again "); + tryAgain = true; + continue; } - else { - if (e.getCause() instanceof ModifiedNodeDoesNotExistException) { - log.debug("Ignoring MpdifiedNodeDoesNotExistException"); - } else { - log.debug("Delete DataStore failed"); - throw new IllegalStateException(e); - } + + if (e.getCause() instanceof ModifiedNodeDoesNotExistException) { + log.debug("Ignoring MpdifiedNodeDoesNotExistException"); + break; } + + log.debug("Delete DataStore failed"); + throw new IllegalStateException(e); } } } diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java new file mode 100644 index 00000000..c74ce534 --- /dev/null +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java @@ -0,0 +1,75 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdnc.vnfapi; + +import org.junit.Before; +import org.mockito.Mock; +import org.onap.sdnc.vnfapi.util.DataBrokerUtil; +import org.onap.sdnc.vnfapi.util.PropBuilder; +import org.onap.sdnc.vnfapi.util.VNFSDNSvcLogicServiceClientMockUtil; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; +import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest; +import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class VnfApiProviderTest extends AbstractConcurrentDataBrokerTest { + + protected vnfapiProvider vnfapiProvider; + protected DataBroker dataBroker; + protected @Mock NotificationPublishService mockNotificationPublishService; + protected @Mock RpcProviderRegistry mockRpcProviderRegistry; + protected @Mock VNFSDNSvcLogicServiceClient mockVNFSDNSvcLogicServiceClient; + protected static final Logger LOG = LoggerFactory.getLogger(vnfapiProvider.class); + + + protected DataBrokerUtil db; + protected VNFSDNSvcLogicServiceClientMockUtil svcClient; + + + @Before + public void setUp() throws Exception { + svcClient = new VNFSDNSvcLogicServiceClientMockUtil(mockVNFSDNSvcLogicServiceClient); + dataBroker = getDataBroker(); + db = new DataBrokerUtil(dataBroker); + try { + vnfapiProvider = new vnfapiProvider( + dataBroker, + mockNotificationPublishService, + mockRpcProviderRegistry, + mockVNFSDNSvcLogicServiceClient + ); + } catch (Exception e) { + LOG.error("Caught exception on setUp", e); + throw e; + } + } + + + public static PropBuilder prop(){ + return (new PropBuilder()); + } + + +} diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfTopologyOperationRPCTest.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfTopologyOperationRPCTest.java new file mode 100644 index 00000000..422a6adb --- /dev/null +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfTopologyOperationRPCTest.java @@ -0,0 +1,174 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdnc.vnfapi; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.runners.MockitoJUnitRunner; +import org.onap.sdnc.vnfapi.util.PropBuilder; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.VnfTopologyOperationInput; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.VnfTopologyOperationOutput; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.sdnc.request.header.SdncRequestHeader.SvcAction; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.vnf.model.infrastructure.VnfList; +import org.opendaylight.yangtools.yang.common.RpcResult; + +import static org.onap.sdnc.vnfapi.util.MDSALUtil.build; +import static org.onap.sdnc.vnfapi.util.MDSALUtil.exec; +import static org.onap.sdnc.vnfapi.util.MDSALUtil.sdncRequestHeader; +import static org.onap.sdnc.vnfapi.util.MDSALUtil.serviceData; +import static org.onap.sdnc.vnfapi.util.MDSALUtil.serviceInformation; +import static org.onap.sdnc.vnfapi.util.MDSALUtil.vnfInformation; +import static org.onap.sdnc.vnfapi.util.MDSALUtil.vnfList; +import static org.onap.sdnc.vnfapi.util.MDSALUtil.vnfRequestInformation; +import static org.onap.sdnc.vnfapi.util.MDSALUtil.vnfTopologyOperationInput; +import static org.onap.sdnc.vnfapi.util.MDSALUtil.vnfTopologyOperationOutput; + + +/** + * This class test the VnfTopologyOperation mdsal RPC. + */ +@RunWith(MockitoJUnitRunner.class) +public class VnfTopologyOperationRPCTest extends VnfApiProviderTest { + + + final String SVC_OPERATION = "vnf-topology-operation"; + + + @Before + public void setUp() throws Exception { + super.setUp(); + svcClient.setScvOperation(SVC_OPERATION); + } + + + /** + * Verify VnfTopologyOperation RPC executes Delete VNFList entry + * {@link VnfTopologyOperationOutput} and persisted the expected {@link VnfList} in the {@link DataBroker} + */ + @Test + public void testVnfTopologyOperationRPC_Delete_VNFList_Entry_Success() throws Exception { + + + //mock svcClient to perform a successful execution with the expected parameters + svcClient.mockHasGraph(true); + PropBuilder svcResultProp = svcClient.createExecuteOKResult(); + svcClient.mockExecute(svcResultProp); + + // create the VnfTopologyOperationInput from the template + VnfTopologyOperationInput vnfTopologyOperationInput = createVTOI(); + + //persist a vnfList entry in the dataBroker + persistVnfListBroker(vnfTopologyOperationInput); + + //execute the mdsal exec + VnfTopologyOperationOutput actualVnfTopologyOperationOutput = exec( + vnfapiProvider::vnfTopologyOperation + , vnfTopologyOperationInput + , RpcResult::getResult + ); + + + //verify the returned VnfTopologyOperationOutput + VnfTopologyOperationOutput expectedVnfTopologyOperationOutput = createExpectedVTOO(svcResultProp,vnfTopologyOperationInput); + Assert.assertEquals(expectedVnfTopologyOperationOutput,actualVnfTopologyOperationOutput); + + + //verify the persisted VnfList + VnfList actualVnfList = db.read(vnfTopologyOperationInput.getVnfRequestInformation().getVnfId(), LogicalDatastoreType.CONFIGURATION); + VnfList expectedVnfList = null; + Assert.assertEquals(expectedVnfList,actualVnfList); + + LOG.debug("done"); + } + + + public VnfTopologyOperationInput createVTOI(){ + return build(vnfTopologyOperationInput() + .setServiceInformation( + build(serviceInformation() + .setServiceId("serviceId: xyz") + .setServiceInstanceId("serviceInstanceId: xyz") + .setServiceType("serviceType: xyz") + .setSubscriberName("subscriberName: xyz") + ) + ) + .setVnfRequestInformation( + build(vnfRequestInformation() + .setVnfId("vnfId: xyz") + .setVnfName("vnfName: xyz")//defect if missing + .setVnfType("vnfType: xyz")//defect if missing + + + ) + ) + .setSdncRequestHeader( + build(sdncRequestHeader() + .setSvcAction(SvcAction.Delete) + ) + ) + ); + + } + + + + private VnfList persistVnfListBroker( + VnfTopologyOperationInput vnfTopologyOperationInput + ) throws Exception{ + VnfList service = build( + vnfList() + .setVnfId(vnfTopologyOperationInput.getVnfRequestInformation().getVnfId()) + .setServiceData( + build(serviceData() + .setVnfId(vnfTopologyOperationInput.getVnfRequestInformation().getVnfId()) + ) + ) + ); + db.write(true,service, LogicalDatastoreType.CONFIGURATION); + return service; + } + + + + + + private VnfTopologyOperationOutput createExpectedVTOO(PropBuilder expectedSvcResultProp,VnfTopologyOperationInput expectedVnfTopologyOperationInput){ + return build( + vnfTopologyOperationOutput() + .setSvcRequestId(expectedVnfTopologyOperationInput.getSdncRequestHeader().getSvcRequestId()) + .setResponseCode(expectedSvcResultProp.get(svcClient.errorCode)) + .setAckFinalIndicator(expectedSvcResultProp.get(svcClient.ackFinal)) + .setResponseMessage(expectedSvcResultProp.get(svcClient.errorMessage)) + .setVnfInformation(build(vnfInformation() + .setVnfId(expectedVnfTopologyOperationInput.getVnfRequestInformation().getVnfId()) + )) + ); + } + + + + +} diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/DataBrokerUtil.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/DataBrokerUtil.java new file mode 100644 index 00000000..d791fa97 --- /dev/null +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/DataBrokerUtil.java @@ -0,0 +1,94 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdnc.vnfapi.util; + +import com.google.common.base.Optional; +import com.google.common.util.concurrent.CheckedFuture; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; +import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.Vnfs; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.vnf.model.infrastructure.VnfList; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.vnf.model.infrastructure.VnfListKey; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + + +/** + * This util class provides utility to read and write {@link VnfList} data objects from the {@link DataBroker} + * + */ +public class DataBrokerUtil { + + + private final DataBroker dataBroker; + + public DataBrokerUtil(DataBroker dataBroker) { + this.dataBroker = dataBroker; + } + + /** @return VnfList - the VnfList object read from the DataBroker or null if none was found */ + public VnfList read(String VnfListKey, LogicalDatastoreType logicalDatastoreType) throws Exception { + InstanceIdentifier VnfListInstanceIdentifier = InstanceIdentifier.builder(Vnfs.class) + .child(VnfList.class, new VnfListKey(VnfListKey)).build(); + ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction(); + Optional data = (Optional) readTx.read(logicalDatastoreType, VnfListInstanceIdentifier).get(); + if(!data.isPresent()){ + return null; + } + return data.get(); + } + + + /** + * Write the {@link VnfList} object to the {@link DataBroker} + * @param isReplace - false specifies the new data is to be merged into existing data, where as true cause the + * existing data to be replaced. + * @param VnfList - the {@link VnfList} data object to be presisted in the db. + * @param logicalDatastoreType - The logicalDatastoreType + */ + public void write(boolean isReplace,VnfList VnfList, LogicalDatastoreType logicalDatastoreType) throws Exception { + // Each entry will be identifiable by a unique key, we have to create that + // identifier + InstanceIdentifier.InstanceIdentifierBuilder VnfListBuilder = InstanceIdentifier + .builder(Vnfs.class).child(VnfList.class, VnfList.getKey()); + InstanceIdentifier path = VnfListBuilder.build(); + + WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); + if (!isReplace) { + tx.merge(logicalDatastoreType, path, VnfList); + } else { + tx.put(logicalDatastoreType, path, VnfList); + } + CheckedFuture cf = tx.submit(); + cf.checkedGet(); + + } + + + + + + + +} diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/MDSALUtil.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/MDSALUtil.java new file mode 100644 index 00000000..b28139c7 --- /dev/null +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/MDSALUtil.java @@ -0,0 +1,113 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdnc.vnfapi.util; + +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.VnfTopologyOperationInputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.VnfTopologyOperationOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.sdnc.request.header.SdncRequestHeaderBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.service.data.ServiceDataBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.service.information.ServiceInformationBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.vnf.information.VnfInformationBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.vnf.model.infrastructure.VnfListBuilder; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.vnf.request.information.VnfRequestInformationBuilder; +import org.opendaylight.yangtools.concepts.Builder; +import org.opendaylight.yangtools.yang.common.RpcResult; + +import java.util.concurrent.Future; +import java.util.function.Consumer; +import java.util.function.Function; + + +/** + * This uill class provides utility to build yang objects using a recursive syntax that resembles the tree structure + * when defining the same yang object in json format. + * + * For Example + * 
+ * {@code
+ * import static org.onap.sdnc.northbound.util.MDSALUtil.*;
+ * VnfTopologyOperationInput input = build(vnfTopologyOperationInput()
+ *                .setServiceInformation(
+ *                        build(serviceInformation()
+ *                                .setServiceId("serviceId: xyz")
+ *                                .setServiceInstanceId("serviceInstanceId: xyz")
+ *                                .setServiceType("serviceType: xyz")
+ *                                .setSubscriberName("subscriberName: xyz")
+ *                        )
+ *                )
+ *                .setVnfRequestInformation(
+ *                        build(vnfRequestInformation()
+ *                                .setVnfId("vnfId: xyz")
+ *                                .setVnfName("vnfName: xyz")//defect if missing
+ *                                .setVnfType("vnfType: xyz")//defect if missing
+ *                        )
+ *                )
+ *                .setSdncRequestHeader(
+ *                        build(sdncRequestHeader()
+ *                          .setSvcAction(SvcAction.Delete)
+ *                        )
+ *                )
+ *        );
+ * );
+ * }
+ *
+ */ +public class MDSALUtil { + + public static VnfTopologyOperationInputBuilder vnfTopologyOperationInput(){return new VnfTopologyOperationInputBuilder();} + public static VnfTopologyOperationOutputBuilder vnfTopologyOperationOutput(){return new VnfTopologyOperationOutputBuilder();} + + public static ServiceInformationBuilder serviceInformation(){return new ServiceInformationBuilder();} + public static VnfRequestInformationBuilder vnfRequestInformation(){return new VnfRequestInformationBuilder();} + public static VnfListBuilder vnfList(){return new VnfListBuilder();} + public static ServiceDataBuilder serviceData() { return new ServiceDataBuilder();} + public static SdncRequestHeaderBuilder sdncRequestHeader(){return new SdncRequestHeaderBuilder();} + public static VnfInformationBuilder vnfInformation(){return new VnfInformationBuilder();} + + + public static

P build(Builder

b) { + return b == null? null :b.build(); + } + + public static > P build(Function builderConstructor,P sourceDataObject){ + if(sourceDataObject == null){ + return null; + } + B bp = builderConstructor.apply(sourceDataObject); + return bp.build(); + } + + public static > P build(Function builderConstructor,P sourceDataObject,Consumer builder){ + if(sourceDataObject == null){ + return null; + } + B bp = builderConstructor.apply(sourceDataObject); + builder.accept(bp); + return bp.build(); + } + + public static O exec(Function>> rpc,I rpcParameter,Function,O> rpcResult) throws Exception { + Future> future = rpc.apply(rpcParameter); + return rpcResult.apply(future.get()); + } + +} diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/PropBuilder.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/PropBuilder.java new file mode 100644 index 00000000..6ecc94c8 --- /dev/null +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/PropBuilder.java @@ -0,0 +1,62 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdnc.vnfapi.util; + +import org.opendaylight.yangtools.concepts.Builder; + +import java.util.Properties; + +/** + * A Util class that adds method chaining to the {@link #set(String, String)} to reducing the syntax needed to populate + * {@link Properties} + */ +public class PropBuilder implements Builder { + + + final Properties prop; + + public PropBuilder(Properties prop) { + this.prop = prop; + } + + public PropBuilder() { + this.prop = new Properties(); + } + + public Properties build(){ + return prop; + } + + public PropBuilder set(String key, String value) { + prop.setProperty(key, value); + return this; + } + + public String get(String key) { + return prop.getProperty(key); + } + + + public static PropBuilder propBuilder(){ + return (new PropBuilder()); + } +} \ No newline at end of file diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/VNFSDNSvcLogicServiceClientMockUtil.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/VNFSDNSvcLogicServiceClientMockUtil.java new file mode 100644 index 00000000..d4d94ca8 --- /dev/null +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/util/VNFSDNSvcLogicServiceClientMockUtil.java @@ -0,0 +1,130 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdnc.vnfapi.util; + +import org.onap.sdnc.vnfapi.VNFSDNSvcLogicServiceClient; +import org.opendaylight.yang.gen.v1.org.onap.sdnctl.vnf.rev150720.service.data.ServiceDataBuilder; + +import java.util.Properties; + +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.isA; +import static org.mockito.Mockito.when; +import static org.onap.sdnc.vnfapi.util.MDSALUtil.build; +import static org.onap.sdnc.vnfapi.util.PropBuilder.propBuilder; + + +/** + * VNFSDNSvcLogicServiceClientMockUtil provides a set of util methods for quickly configuring method + * behaviour on the Mock VNFSDNSvcLogicServiceClient + */ +public class VNFSDNSvcLogicServiceClientMockUtil { + + + private final String MODULE = "VNF-API"; + private final String MODE = "sync"; + private final String VERSION = null; + private String scvOperation = null; + + + public final String errorCode = "error-code"; + public final String errorMessage = "error-message"; + public final String ackFinal = "ack-final"; + public final String serviceObjectPath = "service-object-path"; + public final String networkObjectPath = "network-object-path"; + public final String networkId = "networkId"; + + + private final VNFSDNSvcLogicServiceClient mockVNFSDNSvcLogicServiceClient; + + + + public VNFSDNSvcLogicServiceClientMockUtil(VNFSDNSvcLogicServiceClient mockVNFSDNSvcLogicServiceClient) { + this.mockVNFSDNSvcLogicServiceClient = mockVNFSDNSvcLogicServiceClient; + } + + + /** @param scvOperation - The scvOperation parameter to use on the {@link VNFSDNSvcLogicServiceClient} methods */ + public void setScvOperation(String scvOperation) { + this.scvOperation = scvOperation; + } + + /** + * Configure {@link VNFSDNSvcLogicServiceClient#hasGraph(String, String, String, String)} + * to return the specified value when when invoked with the parameters + * {@link #MODULE}, {@link #MODE}, {@link #VERSION} and {@link #scvOperation} + */ + public void mockHasGraph(Boolean isHasGraph) throws Exception { + when( + mockVNFSDNSvcLogicServiceClient + .hasGraph( + eq(MODULE), + eq(scvOperation), + eq(VERSION), + eq(MODE) + ) + ) + .thenReturn(isHasGraph); + } + + + /** + * @return + * PropBuilder - A PropBuilder populated with the expected properties returned from + * {@link VNFSDNSvcLogicServiceClient#execute(String, String, String, String, ServiceDataBuilder, Properties)} + */ + public PropBuilder createExecuteOKResult(){ + return propBuilder() + .set(errorCode,"200") + .set(errorMessage,"OK") + .set(ackFinal,"Y") + .set(serviceObjectPath,"serviceObjectPath: XYZ") + .set(networkObjectPath,"networkObjectPath: XYZ") + .set(networkId,"networkId: XYZ"); + + } + + + /** + * Configure + * {@link VNFSDNSvcLogicServiceClient#execute(String, String, String, String, ServiceDataBuilder, Properties)} + * to return the specified svcResultProp when when invoked with the parameters + * {@link #MODULE}, {@link #MODE}, {@link #VERSION} and {@link #scvOperation} + */ + public void mockExecute(PropBuilder svcResultProp) throws Exception{ + when( + mockVNFSDNSvcLogicServiceClient + .execute( + eq(MODULE), + eq(scvOperation), + eq(VERSION), + eq(MODE), + isA(ServiceDataBuilder.class), + isA(Properties.class) + ) + ) + .thenReturn(build( + svcResultProp + )); + } + +} -- 2.16.6 From 1e8a80e24b62f66e4d1bacf2be475ffb01c78a17 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 20 Dec 2017 14:25:32 -0500 Subject: [PATCH 15/16] Resolve duplicate file name Renamed vnfapiProviderTest.java to VnfapiProviderTestBase.java to avoid conflict with VnfapiProviderTest.java Change-Id: I500785a038691c17b84faac427232da2f9fdee21 Issue-ID: SDNC-228 Signed-off-by: Dan Timoney --- generic-resource-api/model/pom.xml | 1 + .../vnfapi/{vnfapiProviderTest.java => VnfapiProviderTestBase.java} | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) rename vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/{vnfapiProviderTest.java => VnfapiProviderTestBase.java} (99%) diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index 701b5163..7a140323 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -50,6 +50,7 @@ org.opendaylight.yangtools yang-maven-plugin + ${odl.yangtools.yang.maven.plugin.version} org.opendaylight.mdsal diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java similarity index 99% rename from vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java rename to vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java index 88b73e00..f174f7fa 100644 --- a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java @@ -117,7 +117,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -public class vnfapiProviderTest { +public class VnfapiProviderTestBase { @Rule public MockitoRule rule = MockitoJUnit.rule(); @Mock private DataBroker dataBroker; -- 2.16.6 From a13d7bfaed4f8ff837508eddf90231910e1bc285 Mon Sep 17 00:00:00 2001 From: Jakub Dudycz Date: Tue, 30 Jan 2018 15:04:47 +0100 Subject: [PATCH 16/16] Fixed sonar errors to line 463 Change-Id: Ib3c5a2e872fd47585dca1df49237206e968760e0 Issue-ID: SDNC-242 Signed-off-by: Jakub Dudycz --- .../{vnfapiProvider.java => VnfApiProvider.java} | 256 ++++++++++++--------- .../opendaylight/blueprint/vnfapi-blueprint.xml | 2 +- .../org/onap/sdnc/vnfapi/VnfApiProviderTest.java | 6 +- .../onap/sdnc/vnfapi/VnfapiProviderTestBase.java | 5 +- 4 files changed, 150 insertions(+), 119 deletions(-) rename vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/{vnfapiProvider.java => VnfApiProvider.java} (95%) diff --git a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java similarity index 95% rename from vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java rename to vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java index 30f85859..129f2a4e 100644 --- a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java +++ b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java @@ -152,32 +152,33 @@ import java.util.concurrent.Future; * which provides storage for the most commonly used components of the MD-SAL. Additionally the * base class provides some basic logging and initialization / clean up methods. */ -public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeListener { +public class VnfApiProvider implements AutoCloseable, VNFAPIService, DataChangeListener { + + private final Logger log = LoggerFactory.getLogger(VnfApiProvider.class); + + private static final String APP_NAME = "vnfapi"; + + private VNFSDNSvcLogicServiceClient svcLogicClient; + private final ExecutorService executor; + protected DataBroker dataBroker; protected NotificationPublishService notificationService; protected RpcProviderRegistry rpcRegistry; protected BindingAwareBroker.RpcRegistration rpcRegistration; - private final Logger log = LoggerFactory.getLogger(vnfapiProvider.class); - private final String appName = "vnfapi"; - private final ExecutorService executor; - - private VNFSDNSvcLogicServiceClient svcLogicClient; - private ListenerRegistration dclServices; - - public vnfapiProvider(DataBroker dataBroker2, NotificationPublishService notificationPublishService, + public VnfApiProvider(DataBroker dataBroker2, NotificationPublishService notificationPublishService, RpcProviderRegistry rpcProviderRegistry, VNFSDNSvcLogicServiceClient client) { - this.log.info("Creating provider for " + appName); + log.info("Creating provider for " + APP_NAME); executor = Executors.newFixedThreadPool(1); dataBroker = dataBroker2; notificationService = notificationPublishService; rpcRegistry = rpcProviderRegistry; - this.svcLogicClient = client; + svcLogicClient = client; initialize(); } - public void initialize() { - log.info("Initializing provider for " + appName); + private void initialize() { + log.info("Initializing provider for " + APP_NAME); // Create the top level containers createContainers(); try { @@ -186,7 +187,7 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL log.error("Caught Exception while trying to load properties file: ", e); } - log.info("Initialization complete for " + appName); + log.info("Initialization complete for " + APP_NAME); } private void createContainers() { @@ -236,19 +237,22 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL } } - @Override public void close() throws Exception { - log.info("Closing provider for " + appName); + @Override + public void close() throws Exception { + log.info("Closing provider for " + APP_NAME); executor.shutdown(); rpcRegistration.close(); - log.info("Successfully closed provider for " + appName); + log.info("Successfully closed provider for " + APP_NAME); } // On data change not used - @Override public void onDataChanged(AsyncDataChangeEvent, DataObject> change) { - boolean changed = false; + @Override + public void onDataChanged(AsyncDataChangeEvent, DataObject> change) { + log.info(" IN ON DATA CHANGE: "); - WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); + boolean changed = false; + WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); DataObject updatedSubTree = change.getUpdatedSubtree(); if (updatedSubTree != null) { @@ -256,131 +260,159 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL log.debug("updatedSubTree was non-null:" + updatedSubTree); } if (updatedSubTree instanceof Vnfs) { - ArrayList vnfList = (ArrayList) ((Vnfs) updatedSubTree).getVnfList(); - if (vnfList != null) { - for (VnfList entry : vnfList) { - ServiceData serviceData = entry.getServiceData(); - ServiceStatus serviceStatus = entry.getServiceStatus(); - if (serviceData != null && serviceStatus != null) { - // - // ServiceData change detected, check the AckFinal indicator and request-status to see if we need to proceed. - // - if ((!"Y".equals(serviceStatus.getFinalIndicator())) && (RequestStatus.Synccomplete - .equals(serviceStatus.getRequestStatus()))) { - if (log.isDebugEnabled()) { - log.debug("Final Indicator is not Y, calling handleServiceDataUpdated"); - } - //handleServiceDataUpdated(serviceData, serviceStatus, writeTransaction); - changed = true; - } - } - } - } + changed = isChanged(changed, (Vnfs) updatedSubTree); } if (updatedSubTree instanceof PreloadVnfs) { - ArrayList vnfList = - (ArrayList) ((PreloadVnfs) updatedSubTree).getVnfPreloadList(); - if (vnfList != null) { - for (VnfPreloadList entry : vnfList) { - PreloadData preloadData = entry.getPreloadData(); - if (preloadData != null) { - changed = true; - } - } - } + changed = isChanged(changed, (PreloadVnfs) updatedSubTree); } //1610 if (updatedSubTree instanceof PreloadVnfInstances) { - ArrayList vnfInstanceList = - (ArrayList) ((PreloadVnfInstances) updatedSubTree) - .getVnfInstancePreloadList(); - if (vnfInstanceList != null) { - for (VnfInstancePreloadList entry : vnfInstanceList) { - VnfInstancePreloadData vnfInstancePreloadData = entry.getVnfInstancePreloadData(); - if (vnfInstancePreloadData != null) { - changed = true; - } - } - } + changed = isChanged(changed, (PreloadVnfInstances) updatedSubTree); } //1610 if (updatedSubTree instanceof VnfInstances) { - ArrayList vnfInstanceList = - (ArrayList) ((VnfInstances) updatedSubTree).getVnfInstanceList(); - if (vnfInstanceList != null) { - for (VnfInstanceList entry : vnfInstanceList) { - VnfInstanceServiceData vnfInstanceServiceData = entry.getVnfInstanceServiceData(); - ServiceStatus serviceStatus = entry.getServiceStatus(); - if (vnfInstanceServiceData != null && serviceStatus != null) { - // VnfInstanceServiceData change detected, check the AckFinal indicator and request-status - // to see if we need to proceed. - if ((!"Y".equals(serviceStatus.getFinalIndicator())) && (RequestStatus.Synccomplete - .equals(serviceStatus.getRequestStatus()))) { - if (log.isDebugEnabled()) { - log.debug("Final Indicator is not Y, calling handleServiceDataUpdated"); - } - changed = true; - } - } - } - } + changed = isChanged(changed, (VnfInstances) updatedSubTree); } //1610 if (updatedSubTree instanceof PreloadVfModules) { - ArrayList vnfInstanceList = - (ArrayList) ((PreloadVfModules) updatedSubTree).getVfModulePreloadList(); - if (vnfInstanceList != null) { - for (VfModulePreloadList entry : vnfInstanceList) { - VfModulePreloadData vnfInstancePreloadData = entry.getVfModulePreloadData(); - if (vnfInstancePreloadData != null) { - changed = true; - } - } - } + changed = isChanged(changed, (PreloadVfModules) updatedSubTree); } //1610 if (updatedSubTree instanceof VfModules) { - ArrayList vfModuleList = - (ArrayList) ((VfModules) updatedSubTree).getVfModuleList(); - if (vfModuleList != null) { - for (VfModuleList entry : vfModuleList) { - VfModuleServiceData vfModuleServiceData = entry.getVfModuleServiceData(); - ServiceStatus serviceStatus = entry.getServiceStatus(); - if (vfModuleServiceData != null && serviceStatus != null) { - // VfModuleServiceData change detected, check the AckFinal indicator and request-status to - // see if we need to proceed. - if ((!"Y".equals(serviceStatus.getFinalIndicator())) && (RequestStatus.Synccomplete - .equals(serviceStatus.getRequestStatus()))) { - if (log.isDebugEnabled()) { - log.debug("Final Indicator is not Y, calling handleServiceDataUpdated"); - } - changed = true; - } - } - } - } + changed = isChanged(changed, (VfModules) updatedSubTree); } } + // Do the write transaction only if something changed. if (changed) { CheckedFuture checkedFuture = writeTransaction.submit(); Futures.addCallback(checkedFuture, new FutureCallback() { - @Override public void onSuccess(Void arg0) { + @Override + public void onSuccess(Void arg0) { log.debug("Successfully updated Service Status"); } - @Override public void onFailure(Throwable ex) { - log.debug("Failed updating Service Status", ex); + @Override + public void onFailure(Throwable e) { + log.debug("Failed updating Service Status", e); } }, executor); } } + private boolean isChanged(boolean changed, VfModules updatedSubTree) { + ArrayList vfModuleList = + (ArrayList) updatedSubTree.getVfModuleList(); + if (vfModuleList != null) { + for (VfModuleList entry : vfModuleList) { + VfModuleServiceData vfModuleServiceData = entry.getVfModuleServiceData(); + ServiceStatus serviceStatus = entry.getServiceStatus(); + if (vfModuleServiceData != null && serviceStatus != null) { + // VfModuleServiceData change detected, check the AckFinal indicator and request-status to + // see if we need to proceed. + return isChanged(changed, serviceStatus); + } + } + } + return changed; + } + + private boolean isChanged(boolean changed, PreloadVfModules updatedSubTree) { + ArrayList vnfInstanceList = + (ArrayList) updatedSubTree.getVfModulePreloadList(); + if (vnfInstanceList != null) { + for (VfModulePreloadList entry : vnfInstanceList) { + VfModulePreloadData vnfInstancePreloadData = entry.getVfModulePreloadData(); + if (vnfInstancePreloadData != null) { + return true; + } + } + } + return changed; + } + + private boolean isChanged(boolean changed, VnfInstances updatedSubTree) { + ArrayList vnfInstanceList = + (ArrayList) updatedSubTree.getVnfInstanceList(); + if (vnfInstanceList != null) { + for (VnfInstanceList entry : vnfInstanceList) { + VnfInstanceServiceData vnfInstanceServiceData = entry.getVnfInstanceServiceData(); + ServiceStatus serviceStatus = entry.getServiceStatus(); + if (vnfInstanceServiceData != null && serviceStatus != null) { + // VnfInstanceServiceData change detected, check the AckFinal indicator and request-status + // to see if we need to proceed. + return isChanged(changed, serviceStatus); + } + } + } + return changed; + } + + private boolean isChanged(boolean changed, PreloadVnfInstances updatedSubTree) { + ArrayList vnfInstanceList = + (ArrayList) updatedSubTree + .getVnfInstancePreloadList(); + if (vnfInstanceList != null) { + for (VnfInstancePreloadList entry : vnfInstanceList) { + VnfInstancePreloadData vnfInstancePreloadData = entry.getVnfInstancePreloadData(); + if (vnfInstancePreloadData != null) { + return true; + } + } + } + return changed; + } + + private boolean isChanged(boolean changed, PreloadVnfs updatedSubTree) { + ArrayList vnfList = + (ArrayList) updatedSubTree.getVnfPreloadList(); + if (vnfList != null) { + for (VnfPreloadList entry : vnfList) { + PreloadData preloadData = entry.getPreloadData(); + if (preloadData != null) { + return true; + } + } + } + return changed; + } + + private boolean isChanged(boolean changed, Vnfs updatedSubTree) { + ArrayList vnfList = (ArrayList) updatedSubTree.getVnfList(); + if (vnfList != null) { + for (VnfList entry : vnfList) { + ServiceData serviceData = entry.getServiceData(); + ServiceStatus serviceStatus = entry.getServiceStatus(); + if (serviceData != null && serviceStatus != null) { + // + // ServiceData change detected, check the AckFinal indicator and request-status to see if we need to proceed. + // + return isChanged(changed, serviceStatus); + } + } + } + return changed; + } + + private boolean isChanged(boolean changed, ServiceStatus serviceStatus) { + if ((!"Y".equals(serviceStatus.getFinalIndicator())) && (RequestStatus.Synccomplete + .equals(serviceStatus.getRequestStatus()))) { + if (log.isDebugEnabled()) { + log.debug("Final Indicator is not Y, calling handleServiceDataUpdated"); + } + return true; + } + return changed; + } + private static class Iso8601Util { + private static TimeZone tz = TimeZone.getTimeZone("UTC"); private static DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); + private Iso8601Util() {} + static { df.setTimeZone(tz); } diff --git a/vnfapi/provider/src/main/resources/org/opendaylight/blueprint/vnfapi-blueprint.xml b/vnfapi/provider/src/main/resources/org/opendaylight/blueprint/vnfapi-blueprint.xml index 8741a09f..1afd1a65 100644 --- a/vnfapi/provider/src/main/resources/org/opendaylight/blueprint/vnfapi-blueprint.xml +++ b/vnfapi/provider/src/main/resources/org/opendaylight/blueprint/vnfapi-blueprint.xml @@ -22,7 +22,7 @@ interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" odl:type="default" /> - + diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java index c74ce534..b5b85f6e 100644 --- a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfApiProviderTest.java @@ -36,12 +36,12 @@ import org.slf4j.LoggerFactory; public class VnfApiProviderTest extends AbstractConcurrentDataBrokerTest { - protected vnfapiProvider vnfapiProvider; + protected VnfApiProvider vnfapiProvider; protected DataBroker dataBroker; protected @Mock NotificationPublishService mockNotificationPublishService; protected @Mock RpcProviderRegistry mockRpcProviderRegistry; protected @Mock VNFSDNSvcLogicServiceClient mockVNFSDNSvcLogicServiceClient; - protected static final Logger LOG = LoggerFactory.getLogger(vnfapiProvider.class); + protected static final Logger LOG = LoggerFactory.getLogger(VnfApiProvider.class); protected DataBrokerUtil db; @@ -54,7 +54,7 @@ public class VnfApiProviderTest extends AbstractConcurrentDataBrokerTest { dataBroker = getDataBroker(); db = new DataBrokerUtil(dataBroker); try { - vnfapiProvider = new vnfapiProvider( + vnfapiProvider = new VnfApiProvider( dataBroker, mockNotificationPublishService, mockRpcProviderRegistry, diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java index f174f7fa..0c025523 100644 --- a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java +++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java @@ -105,7 +105,6 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.powermock.reflect.Whitebox; import java.util.ArrayList; -import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; @@ -128,7 +127,7 @@ public class VnfapiProviderTestBase { @Mock private ReadWriteTransaction readWriteTransactionInDataChanged; @Mock private CheckedFuture checkedFuture; - private vnfapiProvider vnfapiProvider; + private VnfApiProvider vnfapiProvider; private String vfModuleName; private String vfModuleModelId; private String vnfInstanceId; @@ -152,7 +151,7 @@ public class VnfapiProviderTestBase { doReturn(writeTransaction).when(dataBroker).newWriteOnlyTransaction(); doReturn(checkedFuture).when(writeTransaction).submit(); - vnfapiProvider = spy(new vnfapiProvider(dataBroker, notificationPublishService, rpcProviderRegistry, + vnfapiProvider = spy(new VnfApiProvider(dataBroker, notificationPublishService, rpcProviderRegistry, vnfsdnSvcLogicServiceClient)); } -- 2.16.6