Code Review / sdnc / northbound.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 8c8634e)
Update GENERIC-RESOURCE-API swagger 14/100614/1
authorDan Timoney <dtimoney@att.com>
Wed, 22 Jan 2020 17:29:21 +0000 (12:29 -0500)
committerDan Timoney <dtimoney@att.com>
Wed, 22 Jan 2020 17:29:21 +0000 (12:29 -0500)
Update swagger for GENERIC-RESOURCE-API to match latest yang

Change-Id: I91937c39c0136696f458765e4ee56143af6f0dd6
Issue-ID: SDNC-980
Signed-off-by: Dan Timoney <dtimoney@att.com>
generic-resource-api/model/src/main/resources/generic-resource-api.20170824.json patch | blob | history

diff --git a/generic-resource-api/model/src/main/resources/generic-resource-api.20170824.json b/generic-resource-api/model/src/main/resources/generic-resource-api.20170824.json
index 3a49b93..f70665f 100644 (file)
--- a/generic-resource-api/model/src/main/resources/generic-resource-api.20170824.json
+++ b/generic-resource-api/model/src/main/resources/generic-resource-api.20170824.json
@@ -5,7 +5,7 @@
   },
   "basePath": "/restconf",
   "paths": {
-    "/config": {
+    "/restconf/config": {
       "post": {
         "consumes": [
           "application/json",
@@ -100,7 +100,7 @@
         "operationId": "POST-GENERIC-RESOURCE-API_module"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources": {
       "delete": {
         "produces": [
           "application/json",
@@ -187,7 +187,7 @@
         "operationId": "PUT-brg-allotted-resources"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -310,7 +310,7 @@
         "operationId": "PUT-brg-allotted-resource"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -449,7 +449,7 @@
         "operationId": "PUT-allotted-resource-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -529,7 +529,7 @@
         "operationId": "PUT-allotted-resource-oper-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -591,18 +591,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)request-information",
+            "name": "**(config)sdnc-request-header",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/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)sdnc-request-header-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)sdnc-request-header",
+            "name": "**(config)request-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/brg-allotted-resources/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)request-information-TOP"
             }
           },
           {
@@ -676,7 +676,7 @@
         "operationId": "PUT-allotted-resource-operation-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": {
+    "/restconf/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",
@@ -791,7 +791,7 @@
         "operationId": "PUT-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/onap-model-information": {
+    "/restconf/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",
@@ -871,7 +871,7 @@
         "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": {
+    "/restconf/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",
@@ -951,7 +951,7 @@
         "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": {
+    "/restconf/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",
@@ -1031,7 +1031,7 @@
         "operationId": "PUT-request-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": {
+    "/restconf/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",
@@ -1111,7 +1111,7 @@
         "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": {
+    "/restconf/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",
@@ -1226,7 +1226,7 @@
         "operationId": "PUT-service-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": {
+    "/restconf/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",
@@ -1306,7 +1306,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -1421,7 +1421,7 @@
         "operationId": "PUT-brg-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -1560,7 +1560,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -1699,7 +1699,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -1815,7 +1815,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -1954,7 +1954,7 @@
         "operationId": "PUT-brg-topology"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/allotted-resource-identifiers": {
+    "/restconf/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",
@@ -2034,7 +2034,7 @@
         "operationId": "PUT-allotted-resource-identifiers"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -2114,7 +2114,7 @@
         "operationId": "PUT-brg-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -2229,7 +2229,7 @@
         "operationId": "PUT-brg-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters/param/{name}": {
+    "/restconf/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",
@@ -2368,7 +2368,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -2507,7 +2507,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/brg-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -2623,7 +2623,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-data/brg-topology/onap-model-information": {
+    "/restconf/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",
@@ -2703,7 +2703,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/allotted-resource-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -2783,7 +2783,7 @@
         "operationId": "PUT-allotted-resource-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources": {
       "delete": {
         "produces": [
           "application/json",
@@ -2870,7 +2870,7 @@
         "operationId": "PUT-connection-attachment-allotted-resources"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -2993,7 +2993,7 @@
         "operationId": "PUT-connection-attachment-allotted-resource"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -3132,7 +3132,7 @@
         "operationId": "PUT-allotted-resource-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -3212,7 +3212,7 @@
         "operationId": "PUT-allotted-resource-oper-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -3290,18 +3290,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)service-information",
+            "name": "**(config)connection-attachment-request-input",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/connection-attachment-allotted-resources/connection-attachment-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/connection-attachment-allotted-resources/connection-attachment-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)connection-attachment-request-input-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)connection-attachment-request-input",
+            "name": "**(config)service-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/connection-attachment-allotted-resources/connection-attachment-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)connection-attachment-request-input-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/connection-attachment-allotted-resources/connection-attachment-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP"
             }
           },
           {
@@ -3359,7 +3359,7 @@
         "operationId": "PUT-allotted-resource-operation-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -3474,7 +3474,7 @@
         "operationId": "PUT-allotted-resource-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -3554,7 +3554,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/connection-attachment-request-input": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/connection-attachment-request-input": {
       "delete": {
         "produces": [
           "application/json",
@@ -3669,7 +3669,7 @@
         "operationId": "PUT-connection-attachment-request-input"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/connection-attachment-request-input/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/connection-attachment-request-input/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -3808,7 +3808,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/connection-attachment-request-input/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/connection-attachment-request-input/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -3947,7 +3947,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/connection-attachment-request-input/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/connection-attachment-request-input/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -4063,7 +4063,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/request-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/request-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -4143,7 +4143,7 @@
         "operationId": "PUT-request-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -4223,7 +4223,7 @@
         "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -4338,7 +4338,7 @@
         "operationId": "PUT-service-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -4418,7 +4418,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -4533,7 +4533,7 @@
         "operationId": "PUT-connection-attachment-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -4672,7 +4672,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -4811,7 +4811,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -4927,7 +4927,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -4997,26 +4997,26 @@
           },
           {
             "in": "body",
-            "name": "**(config)connection-attachment-assignments",
+            "name": "**(config)allotted-resource-identifiers",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/connection-attachment-allotted-resources/connection-attachment-allotted-resource/allotted-resource-data/connection-attachment-topology(config)connection-attachment-assignments-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/connection-attachment-allotted-resources/connection-attachment-allotted-resource/allotted-resource-data/connection-attachment-topology(config)allotted-resource-identifiers-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)allotted-resource-identifiers",
+            "name": "**(config)onap-model-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/connection-attachment-allotted-resources/connection-attachment-allotted-resource/allotted-resource-data/connection-attachment-topology(config)allotted-resource-identifiers-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/connection-attachment-allotted-resources/connection-attachment-allotted-resource/allotted-resource-data/connection-attachment-topology(config)onap-model-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)onap-model-information",
+            "name": "**(config)connection-attachment-assignments",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/connection-attachment-allotted-resources/connection-attachment-allotted-resource/allotted-resource-data/connection-attachment-topology(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/connection-attachment-allotted-resources/connection-attachment-allotted-resource/allotted-resource-data/connection-attachment-topology(config)connection-attachment-assignments-TOP"
             }
           }
         ],
@@ -5066,7 +5066,7 @@
         "operationId": "PUT-connection-attachment-topology"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/allotted-resource-identifiers": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/allotted-resource-identifiers": {
       "delete": {
         "produces": [
           "application/json",
@@ -5146,7 +5146,7 @@
         "operationId": "PUT-allotted-resource-identifiers"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/connection-attachment-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/connection-attachment-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -5226,7 +5226,7 @@
         "operationId": "PUT-connection-attachment-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/connection-attachment-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/connection-attachment-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -5341,7 +5341,7 @@
         "operationId": "PUT-connection-attachment-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/connection-attachment-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/connection-attachment-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -5480,7 +5480,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/connection-attachment-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/connection-attachment-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -5619,7 +5619,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/connection-attachment-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/connection-attachment-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -5735,7 +5735,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-data/connection-attachment-topology/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -5815,7 +5815,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/allotted-resource-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -5895,7 +5895,7 @@
         "operationId": "PUT-allotted-resource-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources": {
       "delete": {
         "produces": [
           "application/json",
@@ -5982,7 +5982,7 @@
         "operationId": "PUT-contrail-route-allotted-resources"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -6105,7 +6105,7 @@
         "operationId": "PUT-contrail-route-allotted-resource"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -6236,7 +6236,7 @@
         "operationId": "PUT-allotted-resource-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -6316,7 +6316,7 @@
         "operationId": "PUT-allotted-resource-oper-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -6394,18 +6394,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)allotted-resource-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)allotted-resource-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)allotted-resource-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)allotted-resource-information-TOP"
             }
           },
           {
@@ -6463,7 +6463,7 @@
         "operationId": "PUT-allotted-resource-operation-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -6578,7 +6578,7 @@
         "operationId": "PUT-allotted-resource-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -6658,7 +6658,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input": {
       "delete": {
         "produces": [
           "application/json",
@@ -6797,7 +6797,7 @@
         "operationId": "PUT-contrail-route-request-input"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/contrail-applied-service-info": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/contrail-applied-service-info": {
       "delete": {
         "produces": [
           "application/json",
@@ -6877,7 +6877,7 @@
         "operationId": "PUT-contrail-applied-service-info"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/contrail-route-input-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/contrail-route-input-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -6992,7 +6992,7 @@
         "operationId": "PUT-contrail-route-input-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/contrail-route-input-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/contrail-route-input-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -7131,7 +7131,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/contrail-route-input-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/contrail-route-input-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -7270,7 +7270,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/contrail-route-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/contrail-route-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -7386,7 +7386,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/dest-network": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/dest-network": {
       "delete": {
         "produces": [
           "application/json",
@@ -7466,7 +7466,7 @@
         "operationId": "PUT-dest-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/source-network": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/contrail-route-request-input/source-network": {
       "delete": {
         "produces": [
           "application/json",
@@ -7546,7 +7546,7 @@
         "operationId": "PUT-source-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/request-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/request-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -7626,7 +7626,7 @@
         "operationId": "PUT-request-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -7706,7 +7706,7 @@
         "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -7821,7 +7821,7 @@
         "operationId": "PUT-service-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -7901,7 +7901,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -7971,18 +7971,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"
             }
           },
           {
@@ -8040,7 +8040,7 @@
         "operationId": "PUT-contrail-route-topology"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/allotted-resource-identifiers": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/allotted-resource-identifiers": {
       "delete": {
         "produces": [
           "application/json",
@@ -8120,7 +8120,7 @@
         "operationId": "PUT-allotted-resource-identifiers"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -8251,7 +8251,7 @@
         "operationId": "PUT-contrail-route-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-assignments/contrail-applied-service": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-assignments/contrail-applied-service": {
       "delete": {
         "produces": [
           "application/json",
@@ -8331,7 +8331,7 @@
         "operationId": "PUT-contrail-applied-service"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-assignments/dest-network": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-assignments/dest-network": {
       "delete": {
         "produces": [
           "application/json",
@@ -8411,7 +8411,7 @@
         "operationId": "PUT-dest-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-assignments/source-network": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-assignments/source-network": {
       "delete": {
         "produces": [
           "application/json",
@@ -8491,7 +8491,7 @@
         "operationId": "PUT-source-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -8606,7 +8606,7 @@
         "operationId": "PUT-contrail-route-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -8745,7 +8745,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -8884,7 +8884,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/contrail-route-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -9000,7 +9000,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -9080,7 +9080,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -9160,7 +9160,7 @@
         "operationId": "PUT-allotted-resource-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations": {
       "delete": {
         "produces": [
           "application/json",
@@ -9247,7 +9247,7 @@
         "operationId": "PUT-generic-configurations"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -9370,7 +9370,7 @@
         "operationId": "PUT-gc-configuration"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -9493,7 +9493,7 @@
         "operationId": "PUT-configuration-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -9573,7 +9573,7 @@
         "operationId": "PUT-configuration-oper-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -9635,18 +9635,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)request-information",
+            "name": "**(config)sdnc-request-header",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information(config)request-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-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/generic-configurations/gc-configuration/configuration-data/configuration-operation-information(config)sdnc-request-header-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information(config)request-information-TOP"
             }
           },
           {
@@ -9720,7 +9720,7 @@
         "operationId": "PUT-configuration-operation-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/configuration-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/configuration-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -9835,7 +9835,7 @@
         "operationId": "PUT-configuration-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/configuration-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/configuration-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -9915,7 +9915,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input": {
       "delete": {
         "produces": [
           "application/json",
@@ -9982,6 +9982,14 @@
             "schema": {
               "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)input-parameters-TOP"
             }
+          },
+          {
+            "in": "body",
+            "name": "**(config)configuration-ids",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)configuration-ids-TOP"
+            }
           }
         ],
         "responses": {
@@ -10030,7 +10038,7 @@
         "operationId": "PUT-gc-request-input"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input/input-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input/configuration-ids/{configuration-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -10042,21 +10050,7 @@
             "name": "configuration-id",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-input-parameters"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
+          },
           {
             "in": "path",
             "name": "configuration-id",
@@ -10066,19 +10060,12 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)input-parameters"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-input-parameters"
+        "operationId": "DELETE-configuration-ids"
       },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -10091,23 +10078,21 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)param",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters(config)param-TOP"
-            }
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)input-parametersPOST"
+              "$ref": "#/definitions/(config)configuration-ids"
             }
           }
         },
-        "operationId": "POST-input-parameters"
+        "operationId": "GET-configuration-ids"
       },
       "put": {
         "consumes": [
@@ -10119,6 +10104,12 @@
           "application/xml"
         ],
         "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "configuration-id",
@@ -10127,10 +10118,10 @@
           },
           {
             "in": "body",
-            "name": "(config)input-parameters",
+            "name": "(config)configuration-ids",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)input-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)configuration-ids-TOP"
             }
           }
         ],
@@ -10138,14 +10129,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)input-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)configuration-ids-TOP"
             }
           }
         },
-        "operationId": "PUT-input-parameters"
+        "operationId": "PUT-configuration-ids"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input/input-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -10157,12 +10148,6 @@
             "name": "configuration-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -10170,7 +10155,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-param"
+        "operationId": "DELETE-input-parameters"
       },
       "get": {
         "produces": [
@@ -10183,23 +10168,17 @@
             "name": "configuration-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)param"
+              "$ref": "#/definitions/(config)input-parameters"
             }
           }
         },
-        "operationId": "GET-param"
+        "operationId": "GET-input-parameters"
       },
       "post": {
         "consumes": [
@@ -10217,18 +10196,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "**(config)resource-resolution-data",
+            "name": "**(config)param",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param(config)resource-resolution-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters(config)param-TOP"
             }
           }
         ],
@@ -10236,11 +10209,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)paramPOST"
+              "$ref": "#/definitions/(config)input-parametersPOST"
             }
           }
         },
-        "operationId": "POST-param"
+        "operationId": "POST-input-parameters"
       },
       "put": {
         "consumes": [
@@ -10258,18 +10231,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)param",
+            "name": "(config)input-parameters",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters(config)param-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)input-parameters-TOP"
             }
           }
         ],
@@ -10277,14 +10244,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters(config)param-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)input-parameters-TOP"
             }
           }
         },
-        "operationId": "PUT-param"
+        "operationId": "PUT-input-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -10309,7 +10276,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-resource-resolution-data"
+        "operationId": "DELETE-param"
       },
       "get": {
         "produces": [
@@ -10334,11 +10301,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)resource-resolution-data"
+              "$ref": "#/definitions/(config)param"
             }
           }
         },
-        "operationId": "GET-resource-resolution-data"
+        "operationId": "GET-param"
       },
       "post": {
         "consumes": [
@@ -10364,48 +10331,7 @@
           },
           {
             "in": "body",
-            "name": "**(config)resource-key",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param/resource-resolution-data(config)resource-key-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)resource-resolution-dataPOST"
-            }
-          }
-        },
-        "operationId": "POST-resource-resolution-data"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "path",
-            "name": "configuration-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)resource-resolution-data",
+            "name": "**(config)resource-resolution-data",
             "required": false,
             "schema": {
               "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param(config)resource-resolution-data-TOP"
@@ -10416,80 +10342,260 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param(config)resource-resolution-data-TOP"
-            }
-          }
-        },
-        "operationId": "PUT-resource-resolution-data"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
-      "delete": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "path",
-            "name": "configuration-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-resource-key"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "path",
-            "name": "configuration-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)resource-key"
+              "$ref": "#/definitions/(config)paramPOST"
             }
           }
         },
-        "operationId": "GET-resource-key"
+        "operationId": "POST-param"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)param",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters(config)param-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters(config)param-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-param"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param/{name}/resource-resolution-data": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-resource-resolution-data"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)resource-resolution-data"
+            }
+          }
+        },
+        "operationId": "GET-resource-resolution-data"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)resource-key",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param/resource-resolution-data(config)resource-key-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)resource-resolution-dataPOST"
+            }
+          }
+        },
+        "operationId": "POST-resource-resolution-data"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)resource-resolution-data",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param(config)resource-resolution-data-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param(config)resource-resolution-data-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-resource-resolution-data"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/gc-request-input/input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-resource-key"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)resource-key"
+            }
+          }
+        },
+        "operationId": "GET-resource-key"
       },
       "put": {
         "consumes": [
@@ -10539,7 +10645,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/request-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/request-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -10619,7 +10725,7 @@
         "operationId": "PUT-request-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/sdnc-request-header": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -10699,7 +10805,7 @@
         "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/service-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -10814,7 +10920,7 @@
         "operationId": "PUT-service-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/service-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-data/configuration-operation-information/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -10894,7 +11000,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:generic-configurations/gc-configuration/{configuration-id}/configuration-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -10974,7 +11080,7 @@
         "operationId": "PUT-configuration-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations": {
       "delete": {
         "produces": [
           "application/json",
@@ -11061,7 +11167,7 @@
         "operationId": "PUT-port-mirror-configurations"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -11184,7 +11290,7 @@
         "operationId": "PUT-port-mirror-configuration"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -11315,7 +11421,7 @@
         "operationId": "PUT-configuration-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -11395,7 +11501,7 @@
         "operationId": "PUT-configuration-oper-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -11457,34 +11563,34 @@
           },
           {
             "in": "body",
-            "name": "**(config)request-information",
+            "name": "**(config)sdnc-request-header",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information(config)request-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-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/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information(config)sdnc-request-header-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information(config)request-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)configuration-information",
+            "name": "**(config)service-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information(config)configuration-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information(config)service-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)service-information",
+            "name": "**(config)configuration-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information(config)service-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information(config)configuration-information-TOP"
             }
           },
           {
@@ -11542,7 +11648,7 @@
         "operationId": "PUT-configuration-operation-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/configuration-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/configuration-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -11657,7 +11763,7 @@
         "operationId": "PUT-configuration-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/configuration-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/configuration-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -11737,7 +11843,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input": {
       "delete": {
         "produces": [
           "application/json",
@@ -11868,7 +11974,7 @@
         "operationId": "PUT-port-mirror-configuration-request-input"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port": {
       "delete": {
         "produces": [
           "application/json",
@@ -11930,18 +12036,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)vnf-information",
+            "name": "**(config)pnf-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port(config)vnf-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port(config)pnf-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)pnf-information",
+            "name": "**(config)vnf-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port(config)pnf-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port(config)vnf-information-TOP"
             }
           }
         ],
@@ -11991,7 +12097,7 @@
         "operationId": "PUT-dest-port"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port/pnf-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port/pnf-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -12106,7 +12212,7 @@
         "operationId": "PUT-pnf-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port/pnf-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port/pnf-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -12186,7 +12292,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port/vnf-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port/vnf-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -12301,7 +12407,7 @@
         "operationId": "PUT-vnf-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port/vnf-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/dest-port/vnf-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -12381,7 +12487,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/port-mirror-configuration-input-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/port-mirror-configuration-input-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -12496,7 +12602,7 @@
         "operationId": "PUT-port-mirror-configuration-input-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/port-mirror-configuration-input-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/port-mirror-configuration-input-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -12635,7 +12741,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/port-mirror-configuration-input-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/port-mirror-configuration-input-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -12774,7 +12880,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/port-mirror-configuration-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/port-mirror-configuration-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -12890,7 +12996,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port": {
       "delete": {
         "produces": [
           "application/json",
@@ -12952,18 +13058,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)vnf-information",
+            "name": "**(config)pnf-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port(config)vnf-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port(config)pnf-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)pnf-information",
+            "name": "**(config)vnf-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port(config)pnf-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port(config)vnf-information-TOP"
             }
           }
         ],
@@ -13013,7 +13119,7 @@
         "operationId": "PUT-source-port"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port/pnf-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port/pnf-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -13128,7 +13234,7 @@
         "operationId": "PUT-pnf-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port/pnf-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port/pnf-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -13208,7 +13314,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port/vnf-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port/vnf-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -13323,7 +13429,7 @@
         "operationId": "PUT-vnf-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port/vnf-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/port-mirror-configuration-request-input/source-port/vnf-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -13403,7 +13509,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/request-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/request-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -13483,7 +13589,7 @@
         "operationId": "PUT-request-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/sdnc-request-header": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -13563,7 +13669,7 @@
         "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/service-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -13678,7 +13784,7 @@
         "operationId": "PUT-service-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/service-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/configuration-operation-information/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -13758,7 +13864,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -13828,18 +13934,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)configuration-identifiers",
+            "name": "**(config)onap-model-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/port-mirror-configuration-topology(config)configuration-identifiers-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/port-mirror-configuration-topology(config)onap-model-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)onap-model-information",
+            "name": "**(config)configuration-identifiers",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/port-mirror-configuration-topology(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/port-mirror-configuration-topology(config)configuration-identifiers-TOP"
             }
           },
           {
@@ -13897,7 +14003,7 @@
         "operationId": "PUT-port-mirror-configuration-topology"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/configuration-identifiers": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/configuration-identifiers": {
       "delete": {
         "produces": [
           "application/json",
@@ -13977,7 +14083,7 @@
         "operationId": "PUT-configuration-identifiers"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -14057,7 +14163,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -14196,7 +14302,7 @@
         "operationId": "PUT-port-mirror-configuration-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/contrail-vmi-params": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/contrail-vmi-params": {
       "delete": {
         "produces": [
           "application/json",
@@ -14311,7 +14417,7 @@
         "operationId": "PUT-contrail-vmi-params"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/contrail-vmi-params/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/contrail-vmi-params/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -14450,7 +14556,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/contrail-vmi-params/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/contrail-vmi-params/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -14589,7 +14695,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/contrail-vmi-params/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/contrail-vmi-params/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -14705,7 +14811,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/dest-vnfc-instance-group-id": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/dest-vnfc-instance-group-id": {
       "delete": {
         "produces": [
           "application/json",
@@ -14785,7 +14891,7 @@
         "operationId": "PUT-dest-vnfc-instance-group-id"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/source-to-dest-maps": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/source-to-dest-maps": {
       "delete": {
         "produces": [
           "application/json",
@@ -14900,7 +15006,7 @@
         "operationId": "PUT-source-to-dest-maps"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/source-to-dest-maps/source-to-dest-map/{source-port-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/source-to-dest-maps/source-to-dest-map/{source-port-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -15039,7 +15145,7 @@
         "operationId": "PUT-source-to-dest-map"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/source-to-dest-maps/source-to-dest-map/{source-port-id}/dest-ip-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/source-to-dest-maps/source-to-dest-map/{source-port-id}/dest-ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -15178,7 +15284,7 @@
         "operationId": "PUT-dest-ip-addresses"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/source-to-dest-maps/source-to-dest-map/{source-port-id}/dest-ip-addresses/ip-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/source-to-dest-maps/source-to-dest-map/{source-port-id}/dest-ip-addresses/ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -15276,7 +15382,7 @@
         "operationId": "PUT-ip-addresses"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/source-vnfc-instance-group-id": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-assignments/source-vnfc-instance-group-id": {
       "delete": {
         "produces": [
           "application/json",
@@ -15356,7 +15462,7 @@
         "operationId": "PUT-source-vnfc-instance-group-id"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -15471,7 +15577,7 @@
         "operationId": "PUT-port-mirror-configuration-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -15610,7 +15716,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -15749,7 +15855,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-data/port-mirror-configuration-topology/port-mirror-configuration-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -15865,7 +15971,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/configuration-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -15945,7 +16051,7 @@
         "operationId": "PUT-configuration-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -16032,7 +16138,7 @@
         "operationId": "PUT-preload-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}": {
       "delete": {
         "produces": [
           "application/json",
@@ -16179,7 +16285,7 @@
         "operationId": "PUT-preload-list"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -16342,7 +16448,7 @@
         "operationId": "PUT-preload-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -16426,14 +16532,6 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "body",
-            "name": "**(config)route-table-reference",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-network-topology-information(config)route-table-reference-TOP"
-            }
-          },
           {
             "in": "body",
             "name": "**(config)network-policy",
@@ -16444,10 +16542,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vpn-bindings",
+            "name": "**(config)route-table-reference",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-network-topology-information(config)vpn-bindings-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-network-topology-information(config)route-table-reference-TOP"
             }
           },
           {
@@ -16460,10 +16558,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)network-topology-identifier-structure",
+            "name": "**(config)vpn-bindings",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-network-topology-information(config)network-topology-identifier-structure-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-network-topology-information(config)vpn-bindings-TOP"
             }
           },
           {
@@ -16473,6 +16571,14 @@
             "schema": {
               "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-network-topology-information(config)subnets-TOP"
             }
+          },
+          {
+            "in": "body",
+            "name": "**(config)network-topology-identifier-structure",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-network-topology-information(config)network-topology-identifier-structure-TOP"
+            }
           }
         ],
         "responses": {
@@ -16529,7 +16635,7 @@
         "operationId": "PUT-preload-network-topology-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/host-routes/{route-prefix}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/host-routes/{route-prefix}": {
       "delete": {
         "produces": [
           "application/json",
@@ -16651,7 +16757,7 @@
         "operationId": "PUT-host-routes"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/network-policy/{network-policy-fqdn}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/network-policy/{network-policy-fqdn}": {
       "delete": {
         "produces": [
           "application/json",
@@ -16773,7 +16879,7 @@
         "operationId": "PUT-network-policy"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/network-topology-identifier-structure": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/network-topology-identifier-structure": {
       "delete": {
         "produces": [
           "application/json",
@@ -16920,7 +17026,7 @@
         "operationId": "PUT-network-topology-identifier-structure"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/network-topology-identifier-structure/related-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/network-topology-identifier-structure/related-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -17067,7 +17173,7 @@
         "operationId": "PUT-related-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/network-topology-identifier-structure/related-networks/related-network/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/network-topology-identifier-structure/related-networks/related-network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -17242,7 +17348,7 @@
         "operationId": "PUT-related-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/network-topology-identifier-structure/related-networks/related-network/{network-id}/vlan-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/network-topology-identifier-structure/related-networks/related-network/{network-id}/vlan-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -17367,7 +17473,7 @@
         "operationId": "PUT-vlan-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/route-table-reference/{route-table-reference-fqdn}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/route-table-reference/{route-table-reference-fqdn}": {
       "delete": {
         "produces": [
           "application/json",
@@ -17489,7 +17595,7 @@
         "operationId": "PUT-route-table-reference"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/subnets/{start-address}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/subnets/{start-address}": {
       "delete": {
         "produces": [
           "application/json",
@@ -17611,7 +17717,7 @@
         "operationId": "PUT-subnets"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/vpn-bindings/{vpn-binding-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-network-topology-information/vpn-bindings/{vpn-binding-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -17733,7 +17839,7 @@
         "operationId": "PUT-vpn-bindings"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -17837,7 +17943,7 @@
         "operationId": "PUT-preload-oper-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -18000,7 +18106,7 @@
         "operationId": "PUT-preload-vf-module-topology-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -18171,7 +18277,7 @@
         "operationId": "PUT-vf-module-topology"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -18275,7 +18381,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -18367,6 +18473,14 @@
               "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)vms-TOP"
             }
           },
+          {
+            "in": "body",
+            "name": "**(config)dhcp-subnet-assignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments-TOP"
+            }
+          },
           {
             "in": "body",
             "name": "**(config)vlan-vnfc-instance-groups",
@@ -18430,7 +18544,7 @@
         "operationId": "PUT-vf-module-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -18457,7 +18571,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vlan-vnfc-instance-groups"
+        "operationId": "DELETE-dhcp-subnet-assignments"
       },
       "get": {
         "produces": [
@@ -18484,11 +18598,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnfc-instance-groups"
+              "$ref": "#/definitions/(config)dhcp-subnet-assignments"
             }
           }
         },
-        "operationId": "GET-vlan-vnfc-instance-groups"
+        "operationId": "GET-dhcp-subnet-assignments"
       },
       "post": {
         "consumes": [
@@ -18516,10 +18630,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vlan-vnfc-instance-group",
+            "name": "**(config)dhcp-subnet-assignment",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP"
             }
           }
         ],
@@ -18527,11 +18641,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnfc-instance-groupsPOST"
+              "$ref": "#/definitions/(config)dhcp-subnet-assignmentsPOST"
             }
           }
         },
-        "operationId": "POST-vlan-vnfc-instance-groups"
+        "operationId": "POST-dhcp-subnet-assignments"
       },
       "put": {
         "consumes": [
@@ -18559,10 +18673,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vlan-vnfc-instance-groups",
+            "name": "(config)dhcp-subnet-assignments",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)vlan-vnfc-instance-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments-TOP"
             }
           }
         ],
@@ -18570,14 +18684,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)vlan-vnfc-instance-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments-TOP"
             }
           }
         },
-        "operationId": "PUT-vlan-vnfc-instance-groups"
+        "operationId": "PUT-dhcp-subnet-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments/dhcp-subnet-assignment/{neutron-subnet-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -18599,9 +18713,9 @@
             "type": "string"
           },
           {
-            "description": "A&AI ID",
+            "description": "Same as subnet-id in subnet-data structure",
             "in": "path",
-            "name": "instance-group-id",
+            "name": "neutron-subnet-id",
             "required": true,
             "type": "string"
           }
@@ -18611,7 +18725,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vlan-vnfc-instance-group"
+        "operationId": "DELETE-dhcp-subnet-assignment"
       },
       "get": {
         "produces": [
@@ -18634,9 +18748,9 @@
             "type": "string"
           },
           {
-            "description": "A&AI ID",
+            "description": "Same as subnet-id in subnet-data structure",
             "in": "path",
-            "name": "instance-group-id",
+            "name": "neutron-subnet-id",
             "required": true,
             "type": "string"
           }
@@ -18645,13 +18759,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnfc-instance-group"
+              "$ref": "#/definitions/(config)dhcp-subnet-assignment"
             }
           }
         },
-        "operationId": "GET-vlan-vnfc-instance-group"
+        "operationId": "GET-dhcp-subnet-assignment"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -18676,18 +18790,18 @@
             "type": "string"
           },
           {
-            "description": "A&AI ID",
+            "description": "Same as subnet-id in subnet-data structure",
             "in": "path",
-            "name": "instance-group-id",
+            "name": "neutron-subnet-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "**(config)vnfcs",
+            "name": "(config)dhcp-subnet-assignment",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP"
             }
           }
         ],
@@ -18695,13 +18809,74 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnfc-instance-groupPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP"
             }
           }
         },
-        "operationId": "POST-vlan-vnfc-instance-group"
+        "operationId": "PUT-dhcp-subnet-assignment"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name or network name",
+            "in": "path",
+            "name": "preload-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "network or vf-module",
+            "in": "path",
+            "name": "preload-type",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vlan-vnfc-instance-groups"
       },
-      "put": {
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name or network name",
+            "in": "path",
+            "name": "preload-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "network or vf-module",
+            "in": "path",
+            "name": "preload-type",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vlan-vnfc-instance-groups"
+            }
+          }
+        },
+        "operationId": "GET-vlan-vnfc-instance-groups"
+      },
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -18726,18 +18901,54 @@
             "type": "string"
           },
           {
-            "description": "A&AI ID",
+            "in": "body",
+            "name": "**(config)vlan-vnfc-instance-group",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vlan-vnfc-instance-groupsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vlan-vnfc-instance-groups"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name or network name",
             "in": "path",
-            "name": "instance-group-id",
+            "name": "preload-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "network or vf-module",
+            "in": "path",
+            "name": "preload-type",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)vlan-vnfc-instance-group",
+            "name": "(config)vlan-vnfc-instance-groups",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)vlan-vnfc-instance-groups-TOP"
             }
           }
         ],
@@ -18745,14 +18956,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)vlan-vnfc-instance-groups-TOP"
             }
           }
         },
-        "operationId": "PUT-vlan-vnfc-instance-group"
+        "operationId": "PUT-vlan-vnfc-instance-groups"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -18786,7 +18997,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfcs"
+        "operationId": "DELETE-vlan-vnfc-instance-group"
       },
       "get": {
         "produces": [
@@ -18820,11 +19031,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfcs"
+              "$ref": "#/definitions/(config)vlan-vnfc-instance-group"
             }
           }
         },
-        "operationId": "GET-vnfcs"
+        "operationId": "GET-vlan-vnfc-instance-group"
       },
       "post": {
         "consumes": [
@@ -18859,10 +19070,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vnfc",
+            "name": "**(config)vnfcs",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
             }
           }
         ],
@@ -18870,11 +19081,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfcsPOST"
+              "$ref": "#/definitions/(config)vlan-vnfc-instance-groupPOST"
             }
           }
         },
-        "operationId": "POST-vnfcs"
+        "operationId": "POST-vlan-vnfc-instance-group"
       },
       "put": {
         "consumes": [
@@ -18909,10 +19120,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vnfcs",
+            "name": "(config)vlan-vnfc-instance-group",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
             }
           }
         ],
@@ -18920,14 +19131,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
             }
           }
         },
-        "operationId": "PUT-vnfcs"
+        "operationId": "PUT-vlan-vnfc-instance-group"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs": {
       "delete": {
         "produces": [
           "application/json",
@@ -18954,12 +19165,6 @@
             "name": "instance-group-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnfc-name",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -18967,7 +19172,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc"
+        "operationId": "DELETE-vnfcs"
       },
       "get": {
         "produces": [
@@ -18995,23 +19200,17 @@
             "name": "instance-group-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnfc-name",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc"
+              "$ref": "#/definitions/(config)vnfcs"
             }
           }
         },
-        "operationId": "GET-vnfc"
+        "operationId": "GET-vnfcs"
       },
       "post": {
         "consumes": [
@@ -19044,18 +19243,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "vnfc-name",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "**(config)vnic-groups",
+            "name": "**(config)vnfc",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
             }
           }
         ],
@@ -19063,11 +19256,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfcPOST"
+              "$ref": "#/definitions/(config)vnfcsPOST"
             }
           }
         },
-        "operationId": "POST-vnfc"
+        "operationId": "POST-vnfcs"
       },
       "put": {
         "consumes": [
@@ -19100,18 +19293,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "vnfc-name",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)vnfc",
+            "name": "(config)vnfcs",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
             }
           }
         ],
@@ -19119,14 +19306,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
             }
           }
         },
-        "operationId": "PUT-vnfc"
+        "operationId": "PUT-vnfcs"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -19166,7 +19353,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnic-groups"
+        "operationId": "DELETE-vnfc"
       },
       "get": {
         "produces": [
@@ -19206,11 +19393,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-groups"
+              "$ref": "#/definitions/(config)vnfc"
             }
           }
         },
-        "operationId": "GET-vnic-groups"
+        "operationId": "GET-vnfc"
       },
       "post": {
         "consumes": [
@@ -19251,10 +19438,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vnic-group",
+            "name": "**(config)vnic-groups",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
             }
           }
         ],
@@ -19262,11 +19449,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-groupsPOST"
+              "$ref": "#/definitions/(config)vnfcPOST"
             }
           }
         },
-        "operationId": "POST-vnic-groups"
+        "operationId": "POST-vnfc"
       },
       "put": {
         "consumes": [
@@ -19307,10 +19494,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vnic-groups",
+            "name": "(config)vnfc",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
             }
           }
         ],
@@ -19318,14 +19505,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
             }
           }
         },
-        "operationId": "PUT-vnic-groups"
+        "operationId": "PUT-vnfc"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups": {
       "delete": {
         "produces": [
           "application/json",
@@ -19358,13 +19545,6 @@
             "name": "vnfc-name",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "Same as network-role of network where vnic is connected",
-            "in": "path",
-            "name": "vnic-interface-role",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -19372,7 +19552,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnic-group"
+        "operationId": "DELETE-vnic-groups"
       },
       "get": {
         "produces": [
@@ -19406,24 +19586,17 @@
             "name": "vnfc-name",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "Same as network-role of network where vnic is connected",
-            "in": "path",
-            "name": "vnic-interface-role",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-group"
+              "$ref": "#/definitions/(config)vnic-groups"
             }
           }
         },
-        "operationId": "GET-vnic-group"
+        "operationId": "GET-vnic-groups"
       },
       "post": {
         "consumes": [
@@ -19462,27 +19635,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "description": "Same as network-role of network where vnic is connected",
-            "in": "path",
-            "name": "vnic-interface-role",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "**(config)vlan-common-ip-addresses",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)vlan-vnics",
+            "name": "**(config)vnic-group",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
             }
           }
         ],
@@ -19490,11 +19648,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-groupPOST"
+              "$ref": "#/definitions/(config)vnic-groupsPOST"
             }
           }
         },
-        "operationId": "POST-vnic-group"
+        "operationId": "POST-vnic-groups"
       },
       "put": {
         "consumes": [
@@ -19533,19 +19691,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "description": "Same as network-role of network where vnic is connected",
-            "in": "path",
-            "name": "vnic-interface-role",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)vnic-group",
+            "name": "(config)vnic-groups",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
             }
           }
         ],
@@ -19553,14 +19704,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
             }
           }
         },
-        "operationId": "PUT-vnic-group"
+        "operationId": "PUT-vnic-groups"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-common-ip-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}": {
       "delete": {
         "produces": [
           "application/json",
@@ -19607,7 +19758,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vlan-common-ip-addresses"
+        "operationId": "DELETE-vnic-group"
       },
       "get": {
         "produces": [
@@ -19654,11 +19805,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-common-ip-addresses"
+              "$ref": "#/definitions/(config)vnic-group"
             }
           }
         },
-        "operationId": "GET-vlan-common-ip-addresses"
+        "operationId": "GET-vnic-group"
       },
       "post": {
         "consumes": [
@@ -19706,10 +19857,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)ip-addresses",
+            "name": "**(config)vlan-common-ip-addresses",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-common-ip-addresses(config)ip-addresses-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)vlan-vnics",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
             }
           }
         ],
@@ -19717,11 +19876,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-common-ip-addressesPOST"
+              "$ref": "#/definitions/(config)vnic-groupPOST"
             }
           }
         },
-        "operationId": "POST-vlan-common-ip-addresses"
+        "operationId": "POST-vnic-group"
       },
       "put": {
         "consumes": [
@@ -19769,10 +19928,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vlan-common-ip-addresses",
+            "name": "(config)vnic-group",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
             }
           }
         ],
@@ -19780,14 +19939,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
             }
           }
         },
-        "operationId": "PUT-vlan-common-ip-addresses"
+        "operationId": "PUT-vnic-group"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-common-ip-addresses/ip-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-common-ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -19834,7 +19993,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-ip-addresses"
+        "operationId": "DELETE-vlan-common-ip-addresses"
       },
       "get": {
         "produces": [
@@ -19881,13 +20040,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)ip-addresses"
+              "$ref": "#/definitions/(config)vlan-common-ip-addresses"
             }
           }
         },
-        "operationId": "GET-ip-addresses"
+        "operationId": "GET-vlan-common-ip-addresses"
       },
-      "put": {
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -19933,7 +20092,7 @@
           },
           {
             "in": "body",
-            "name": "(config)ip-addresses",
+            "name": "**(config)ip-addresses",
             "required": false,
             "schema": {
               "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-common-ip-addresses(config)ip-addresses-TOP"
@@ -19944,15 +20103,17 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-common-ip-addresses(config)ip-addresses-TOP"
+              "$ref": "#/definitions/(config)vlan-common-ip-addressesPOST"
             }
           }
         },
-        "operationId": "PUT-ip-addresses"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics": {
-      "delete": {
+        "operationId": "POST-vlan-common-ip-addresses"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -19991,16 +20152,29 @@
             "name": "vnic-interface-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vlan-common-ip-addresses",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
+            }
           }
         },
-        "operationId": "DELETE-vlan-vnics"
-      },
-      "get": {
+        "operationId": "PUT-vlan-common-ip-addresses"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-common-ip-addresses/ip-addresses": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -20043,19 +20217,12 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)vlan-vnics"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-vlan-vnics"
+        "operationId": "DELETE-ip-addresses"
       },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -20094,25 +20261,17 @@
             "name": "vnic-interface-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "**(config)vlan-vnic",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnicsPOST"
+              "$ref": "#/definitions/(config)ip-addresses"
             }
           }
         },
-        "operationId": "POST-vlan-vnics"
+        "operationId": "GET-ip-addresses"
       },
       "put": {
         "consumes": [
@@ -20160,10 +20319,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vlan-vnics",
+            "name": "(config)ip-addresses",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-common-ip-addresses(config)ip-addresses-TOP"
             }
           }
         ],
@@ -20171,14 +20330,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-common-ip-addresses(config)ip-addresses-TOP"
             }
           }
         },
-        "operationId": "PUT-vlan-vnics"
+        "operationId": "PUT-ip-addresses"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics": {
       "delete": {
         "produces": [
           "application/json",
@@ -20218,12 +20377,6 @@
             "name": "vnic-interface-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnic-port-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -20231,7 +20384,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vlan-vnic"
+        "operationId": "DELETE-vlan-vnics"
       },
       "get": {
         "produces": [
@@ -20272,25 +20425,82 @@
             "name": "vnic-interface-role",
             "required": true,
             "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vlan-vnics"
+            }
+          }
+        },
+        "operationId": "GET-vlan-vnics"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name or network name",
+            "in": "path",
+            "name": "preload-id",
+            "required": true,
+            "type": "string"
           },
           {
+            "description": "network or vf-module",
             "in": "path",
-            "name": "vnic-port-id",
+            "name": "preload-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "A&AI ID",
+            "in": "path",
+            "name": "instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Same as network-role of network where vnic is connected",
+            "in": "path",
+            "name": "vnic-interface-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vlan-vnic",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnic"
+              "$ref": "#/definitions/(config)vlan-vnicsPOST"
             }
           }
         },
-        "operationId": "GET-vlan-vnic"
+        "operationId": "POST-vlan-vnics"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -20334,18 +20544,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "vnic-port-id",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "**(config)vnic-sub-interfaces",
+            "name": "(config)vlan-vnics",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
             }
           }
         ],
@@ -20353,17 +20557,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnicPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
             }
           }
         },
-        "operationId": "POST-vlan-vnic"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-vlan-vnics"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -20408,29 +20610,16 @@
             "name": "vnic-port-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)vlan-vnic",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-vlan-vnic"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces": {
-      "delete": {
+        "operationId": "DELETE-vlan-vnic"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -20479,12 +20668,19 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vlan-vnic"
+            }
           }
         },
-        "operationId": "DELETE-vnic-sub-interfaces"
+        "operationId": "GET-vlan-vnic"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -20529,19 +20725,27 @@
             "name": "vnic-port-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnic-sub-interfaces",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-sub-interfaces"
+              "$ref": "#/definitions/(config)vlan-vnicPOST"
             }
           }
         },
-        "operationId": "GET-vnic-sub-interfaces"
+        "operationId": "POST-vlan-vnic"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -20593,10 +20797,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)sub-interface-network-data",
+            "name": "(config)vlan-vnic",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
             }
           }
         ],
@@ -20604,17 +20808,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-sub-interfacesPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
             }
           }
         },
-        "operationId": "POST-vnic-sub-interfaces"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-vlan-vnic"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -20659,29 +20861,16 @@
             "name": "vnic-port-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)vnic-sub-interfaces",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-vnic-sub-interfaces"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}": {
-      "delete": {
+        "operationId": "DELETE-vnic-sub-interfaces"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -20726,23 +20915,23 @@
             "name": "vnic-port-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "Subinterface network id (UUID in A&AI)",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnic-sub-interfaces"
+            }
           }
         },
-        "operationId": "DELETE-sub-interface-network-data"
+        "operationId": "GET-vnic-sub-interfaces"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -20789,24 +20978,25 @@
             "type": "string"
           },
           {
-            "description": "Subinterface network id (UUID in A&AI)",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)sub-interface-network-data",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sub-interface-network-data"
+              "$ref": "#/definitions/(config)vnic-sub-interfacesPOST"
             }
           }
         },
-        "operationId": "GET-sub-interface-network-data"
+        "operationId": "POST-vnic-sub-interfaces"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -20856,27 +21046,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "description": "Subinterface network id (UUID in A&AI)",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "**(config)network-information-items",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
-            }
-          },
           {
             "in": "body",
-            "name": "**(config)floating-ips",
+            "name": "(config)vnic-sub-interfaces",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
             }
           }
         ],
@@ -20884,17 +21059,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sub-interface-network-dataPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
             }
           }
         },
-        "operationId": "POST-sub-interface-network-data"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-vnic-sub-interfaces"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -20946,29 +21119,16 @@
             "name": "network-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)sub-interface-network-data",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-sub-interface-network-data"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/floating-ips": {
-      "delete": {
+        "operationId": "DELETE-sub-interface-network-data"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -21024,12 +21184,19 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)sub-interface-network-data"
+            }
           }
         },
-        "operationId": "DELETE-floating-ips"
+        "operationId": "GET-sub-interface-network-data"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -21081,17 +21248,33 @@
             "name": "network-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)network-information-items",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)floating-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)floating-ips"
+              "$ref": "#/definitions/(config)sub-interface-network-dataPOST"
             }
           }
         },
-        "operationId": "GET-floating-ips"
+        "operationId": "POST-sub-interface-network-data"
       },
       "put": {
         "consumes": [
@@ -21152,10 +21335,10 @@
           },
           {
             "in": "body",
-            "name": "(config)floating-ips",
+            "name": "(config)sub-interface-network-data",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
             }
           }
         ],
@@ -21163,14 +21346,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
             }
           }
         },
-        "operationId": "PUT-floating-ips"
+        "operationId": "PUT-sub-interface-network-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/floating-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -21230,7 +21413,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-network-information-items"
+        "operationId": "DELETE-floating-ips"
       },
       "get": {
         "produces": [
@@ -21290,13 +21473,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-items"
+              "$ref": "#/definitions/(config)floating-ips"
             }
           }
         },
-        "operationId": "GET-network-information-items"
+        "operationId": "GET-floating-ips"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -21355,10 +21538,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)network-information-item",
+            "name": "(config)floating-ips",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
             }
           }
         ],
@@ -21366,17 +21549,220 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-itemsPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
             }
           }
         },
-        "operationId": "POST-network-information-items"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-floating-ips"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name or network name",
+            "in": "path",
+            "name": "preload-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "network or vf-module",
+            "in": "path",
+            "name": "preload-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "A&AI ID",
+            "in": "path",
+            "name": "instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Same as network-role of network where vnic is connected",
+            "in": "path",
+            "name": "vnic-interface-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnic-port-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-network-information-items"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name or network name",
+            "in": "path",
+            "name": "preload-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "network or vf-module",
+            "in": "path",
+            "name": "preload-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "A&AI ID",
+            "in": "path",
+            "name": "instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Same as network-role of network where vnic is connected",
+            "in": "path",
+            "name": "vnic-interface-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnic-port-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)network-information-items"
+            }
+          }
+        },
+        "operationId": "GET-network-information-items"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name or network name",
+            "in": "path",
+            "name": "preload-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "network or vf-module",
+            "in": "path",
+            "name": "preload-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "A&AI ID",
+            "in": "path",
+            "name": "instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Same as network-role of network where vnic is connected",
+            "in": "path",
+            "name": "vnic-interface-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnic-port-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)network-information-item",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)network-information-itemsPOST"
+            }
+          }
+        },
+        "operationId": "POST-network-information-items"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -21449,7 +21835,7 @@
         "operationId": "PUT-network-information-items"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}": {
       "delete": {
         "produces": [
           "application/json",
@@ -21756,7 +22142,7 @@
         "operationId": "PUT-network-information-item"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}/network-ips": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}/network-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -21980,7 +22366,7 @@
         "operationId": "PUT-network-ips"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms": {
       "delete": {
         "produces": [
           "application/json",
@@ -22127,7 +22513,7 @@
         "operationId": "PUT-vms"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}": {
       "delete": {
         "produces": [
           "application/json",
@@ -22314,7 +22700,7 @@
         "operationId": "PUT-vm"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -22436,7 +22822,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names": {
       "delete": {
         "produces": [
           "application/json",
@@ -22607,7 +22993,7 @@
         "operationId": "PUT-vm-names"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -22802,7 +23188,7 @@
         "operationId": "PUT-vnfc-names"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -22997,7 +23383,7 @@
         "operationId": "PUT-vnfc-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}": {
       "delete": {
         "produces": [
           "application/json",
@@ -23232,7 +23618,7 @@
         "operationId": "PUT-vnfc-network-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/connection-point": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/connection-point": {
       "delete": {
         "produces": [
           "application/json",
@@ -23451,7 +23837,7 @@
         "operationId": "PUT-connection-point"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/connection-point/vlan-data/{vlan-uuid}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/connection-point/vlan-data/{vlan-uuid}": {
       "delete": {
         "produces": [
           "application/json",
@@ -23630,7 +24016,7 @@
         "operationId": "PUT-vlan-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports": {
       "delete": {
         "produces": [
           "application/json",
@@ -23849,7 +24235,7 @@
         "operationId": "PUT-vnfc-ports"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -24096,7 +24482,7 @@
         "operationId": "PUT-vnfc-port"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces": {
       "delete": {
         "produces": [
           "application/json",
@@ -24343,7 +24729,7 @@
         "operationId": "PUT-vnic-sub-interfaces"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -24626,7 +25012,7 @@
         "operationId": "PUT-sub-interface-network-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/floating-ips": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/floating-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -24826,7 +25212,7 @@
         "operationId": "PUT-floating-ips"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items": {
       "delete": {
         "produces": [
           "application/json",
@@ -25101,7 +25487,7 @@
         "operationId": "PUT-network-information-items"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}": {
       "delete": {
         "produces": [
           "application/json",
@@ -25404,7 +25790,7 @@
         "operationId": "PUT-network-information-item"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}/network-ips": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}/network-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -25625,7 +26011,7 @@
         "operationId": "PUT-network-ips"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}": {
       "delete": {
         "produces": [
           "application/json",
@@ -25872,7 +26258,7 @@
         "operationId": "PUT-vnfc-subnet"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}/vnfc-ip-assignments/{vnfc-address-family}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}/vnfc-ip-assignments/{vnfc-address-family}": {
       "delete": {
         "produces": [
           "application/json",
@@ -26147,7 +26533,7 @@
         "operationId": "PUT-vnfc-ip-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}/vnfc-ip-assignments/{vnfc-address-family}/vnfc-subnet-ip/{vnfc-ip-address}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}/vnfc-ip-assignments/{vnfc-address-family}/vnfc-subnet-ip/{vnfc-ip-address}": {
       "delete": {
         "produces": [
           "application/json",
@@ -26368,7 +26754,7 @@
         "operationId": "PUT-vnfc-subnet-ip"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -26539,7 +26925,7 @@
         "operationId": "PUT-vm-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}": {
       "delete": {
         "produces": [
           "application/json",
@@ -26778,7 +27164,7 @@
         "operationId": "PUT-vm-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/floating-ips": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/floating-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -26921,7 +27307,7 @@
         "operationId": "PUT-floating-ips"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/interface-route-prefixes": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/interface-route-prefixes": {
       "delete": {
         "produces": [
           "application/json",
@@ -27064,7 +27450,7 @@
         "operationId": "PUT-interface-route-prefixes"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/mac-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/mac-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -27207,7 +27593,7 @@
         "operationId": "PUT-mac-addresses"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items": {
       "delete": {
         "produces": [
           "application/json",
@@ -27406,7 +27792,7 @@
         "operationId": "PUT-network-information-items"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items/network-information-item/{ip-version}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items/network-information-item/{ip-version}": {
       "delete": {
         "produces": [
           "application/json",
@@ -27633,7 +28019,7 @@
         "operationId": "PUT-network-information-item"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items/network-information-item/{ip-version}/network-ips": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items/network-information-item/{ip-version}/network-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -27797,7 +28183,7 @@
         "operationId": "PUT-network-ips"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -27996,7 +28382,7 @@
         "operationId": "PUT-related-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks/related-network/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks/related-network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -28223,7 +28609,7 @@
         "operationId": "PUT-related-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks/related-network/{network-id}/vlan-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks/related-network/{network-id}/vlan-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -28387,7 +28773,7 @@
         "operationId": "PUT-vlan-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -28594,7 +28980,7 @@
         "operationId": "PUT-sriov-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -28801,7 +29187,7 @@
         "operationId": "PUT-application-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags/c-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags/c-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -28944,7 +29330,7 @@
         "operationId": "PUT-c-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags/s-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags/s-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -29087,7 +29473,7 @@
         "operationId": "PUT-s-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/heat-vlan-filters": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/heat-vlan-filters": {
       "delete": {
         "produces": [
           "application/json",
@@ -29230,7 +29616,7 @@
         "operationId": "PUT-heat-vlan-filters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -29377,7 +29763,7 @@
         "operationId": "PUT-vf-module-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -29548,7 +29934,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -29719,7 +30105,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -29859,7 +30245,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-topology-identifier": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-topology-identifier": {
       "delete": {
         "produces": [
           "application/json",
@@ -29963,7 +30349,7 @@
         "operationId": "PUT-vf-module-topology-identifier"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -30118,7 +30504,7 @@
         "operationId": "PUT-vnf-resource-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/availability-zones": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/availability-zones": {
       "delete": {
         "produces": [
           "application/json",
@@ -30222,7 +30608,7 @@
         "operationId": "PUT-availability-zones"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -30369,7 +30755,7 @@
         "operationId": "PUT-vnf-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}": {
       "delete": {
         "produces": [
           "application/json",
@@ -30552,7 +30938,7 @@
         "operationId": "PUT-vnf-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -30727,7 +31113,7 @@
         "operationId": "PUT-related-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -30930,7 +31316,7 @@
         "operationId": "PUT-related-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}/vlan-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}/vlan-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -31076,7 +31462,7 @@
         "operationId": "PUT-vlan-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/subnets-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/subnets-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -31251,7 +31637,7 @@
         "operationId": "PUT-subnets-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/subnets-data/subnet-data/{sdnc-subnet-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/subnets-data/subnet-data/{sdnc-subnet-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -31397,7 +31783,7 @@
         "operationId": "PUT-subnet-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-topology-identifier-structure": {
+    "/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{preload-id}/{preload-type}/preload-data/preload-vf-module-topology-information/vnf-topology-identifier-structure": {
       "delete": {
         "produces": [
           "application/json",
@@ -31501,7 +31887,7 @@
         "operationId": "PUT-vnf-topology-identifier-structure"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources": {
       "delete": {
         "produces": [
           "application/json",
@@ -31588,7 +31974,7 @@
         "operationId": "PUT-security-zone-allotted-resources"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -31711,7 +32097,7 @@
         "operationId": "PUT-security-zone-allotted-resource"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -31850,7 +32236,7 @@
         "operationId": "PUT-allotted-resource-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -31930,7 +32316,7 @@
         "operationId": "PUT-allotted-resource-oper-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -32008,10 +32394,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)allotted-resource-information",
+            "name": "**(config)service-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)allotted-resource-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/security-zone-allotted-resources/security-zone-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)service-information-TOP"
             }
           },
           {
@@ -32024,10 +32410,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)service-information",
+            "name": "**(config)allotted-resource-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)service-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/security-zone-allotted-resources/security-zone-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)allotted-resource-information-TOP"
             }
           }
         ],
@@ -32077,7 +32463,7 @@
         "operationId": "PUT-allotted-resource-operation-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -32192,7 +32578,7 @@
         "operationId": "PUT-allotted-resource-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -32272,7 +32658,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/request-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/request-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -32352,7 +32738,7 @@
         "operationId": "PUT-request-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -32432,7 +32818,7 @@
         "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/security-zone-request-input": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/security-zone-request-input": {
       "delete": {
         "produces": [
           "application/json",
@@ -32547,7 +32933,7 @@
         "operationId": "PUT-security-zone-request-input"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/security-zone-request-input/security-zone-input-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/security-zone-request-input/security-zone-input-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -32662,7 +33048,7 @@
         "operationId": "PUT-security-zone-input-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/security-zone-request-input/security-zone-input-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/security-zone-request-input/security-zone-input-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -32801,7 +33187,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/security-zone-request-input/security-zone-input-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/security-zone-request-input/security-zone-input-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -32940,7 +33326,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/security-zone-request-input/security-zone-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/security-zone-request-input/security-zone-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -33056,7 +33442,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -33171,7 +33557,7 @@
         "operationId": "PUT-service-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -33251,7 +33637,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -33366,7 +33752,7 @@
         "operationId": "PUT-security-zone-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -33505,7 +33891,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -33644,7 +34030,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -33760,7 +34146,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -33830,18 +34216,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)onap-model-information",
+            "name": "**(config)allotted-resource-identifiers",
             "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)allotted-resource-identifiers-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)allotted-resource-identifiers",
+            "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)allotted-resource-identifiers-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"
             }
           },
           {
@@ -33899,7 +34285,7 @@
         "operationId": "PUT-security-zone-topology"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/allotted-resource-identifiers": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/allotted-resource-identifiers": {
       "delete": {
         "produces": [
           "application/json",
@@ -33979,7 +34365,7 @@
         "operationId": "PUT-allotted-resource-identifiers"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -34059,7 +34445,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/security-zone-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/security-zone-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -34139,7 +34525,7 @@
         "operationId": "PUT-security-zone-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/security-zone-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/security-zone-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -34254,7 +34640,7 @@
         "operationId": "PUT-security-zone-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/security-zone-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/security-zone-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -34393,7 +34779,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/security-zone-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/security-zone-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -34532,7 +34918,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/security-zone-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-data/security-zone-topology/security-zone-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -34648,7 +35034,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/allotted-resource-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -34728,7 +35114,7 @@
         "operationId": "PUT-allotted-resource-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services": {
+    "/restconf/config/GENERIC-RESOURCE-API:services": {
       "delete": {
         "produces": [
           "application/json",
@@ -34815,7 +35201,7 @@
         "operationId": "PUT-services"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -34942,7 +35328,7 @@
         "operationId": "PUT-service"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -35013,6 +35399,14 @@
               "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)networks-TOP"
             }
           },
+          {
+            "in": "body",
+            "name": "**(config)pnfs",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)pnfs-TOP"
+            }
+          },
           {
             "in": "body",
             "name": "**(config)vnfs",
@@ -35071,34 +35465,34 @@
           },
           {
             "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)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)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"
             }
           },
           {
@@ -35165,7 +35559,7 @@
         "operationId": "PUT-service-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/consumed-allotted-resources": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/consumed-allotted-resources": {
       "delete": {
         "produces": [
           "application/json",
@@ -35284,7 +35678,7 @@
         "operationId": "PUT-consumed-allotted-resources"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/consumed-allotted-resources/consumed-allotted-resource/{allotted-resource-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/consumed-allotted-resources/consumed-allotted-resource/{allotted-resource-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -35385,7 +35779,7 @@
         "operationId": "PUT-consumed-allotted-resource"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths": {
       "delete": {
         "produces": [
           "application/json",
@@ -35504,7 +35898,7 @@
         "operationId": "PUT-forwarding-paths"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -35659,7 +36053,7 @@
         "operationId": "PUT-forwarding-path"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -35763,7 +36157,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths": {
       "delete": {
         "produces": [
           "application/json",
@@ -35910,7 +36304,7 @@
         "operationId": "PUT-service-paths"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths/service-path/{service-path-instance-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths/service-path/{service-path-instance-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -36085,7 +36479,7 @@
         "operationId": "PUT-service-path"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths/service-path/{service-path-instance-id}/service/{service-instance-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths/service-path/{service-path-instance-id}/service/{service-instance-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -36288,7 +36682,7 @@
         "operationId": "PUT-service"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths/service-path/{service-path-instance-id}/service/{service-instance-id}/vnfs": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths/service-path/{service-path-instance-id}/service/{service-instance-id}/vnfs": {
       "delete": {
         "produces": [
           "application/json",
@@ -36491,7 +36885,7 @@
         "operationId": "PUT-vnfs"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths/service-path/{service-path-instance-id}/service/{service-instance-id}/vnfs/vnf/{vnf-instance-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths/service-path/{service-path-instance-id}/service/{service-instance-id}/vnfs/vnf/{vnf-instance-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -36722,7 +37116,7 @@
         "operationId": "PUT-vnf"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths/service-path/{service-path-instance-id}/service/{service-instance-id}/vnfs/vnf/{vnf-instance-id}/vf-module-instance": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/forwarding-paths/forwarding-path/{forwarding-path-id}/service-paths/service-path/{service-path-instance-id}/service/{service-instance-id}/vnfs/vnf/{vnf-instance-id}/vf-module-instance": {
       "delete": {
         "produces": [
           "application/json",
@@ -36889,7 +37283,7 @@
         "operationId": "PUT-vf-module-instance"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups": {
       "delete": {
         "produces": [
           "application/json",
@@ -37008,7 +37402,7 @@
         "operationId": "PUT-network-instance-groups"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -37108,6 +37502,14 @@
               "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)vpn-binding-policy-TOP"
             }
           },
+          {
+            "in": "body",
+            "name": "**(config)aggregate-route-policy",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-route-policy-TOP"
+            }
+          },
           {
             "in": "body",
             "name": "**(config)networks",
@@ -37131,6 +37533,14 @@
             "schema": {
               "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)subnets-TOP"
             }
+          },
+          {
+            "in": "body",
+            "name": "**(config)aggregate-routes",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-routes-TOP"
+            }
           }
         ],
         "responses": {
@@ -37187,7 +37597,7 @@
         "operationId": "PUT-network-instance-group"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/aggregate-route-policy": {
       "delete": {
         "produces": [
           "application/json",
@@ -37214,7 +37624,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-networks"
+        "operationId": "DELETE-aggregate-route-policy"
       },
       "get": {
         "produces": [
@@ -37241,13 +37651,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)networks"
+              "$ref": "#/definitions/(config)aggregate-route-policy"
             }
           }
         },
-        "operationId": "GET-networks"
+        "operationId": "GET-aggregate-route-policy"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -37273,10 +37683,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)network",
+            "name": "(config)aggregate-route-policy",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks(config)network-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-route-policy-TOP"
             }
           }
         ],
@@ -37284,57 +37694,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)networksPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-route-policy-TOP"
             }
           }
         },
-        "operationId": "POST-networks"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Also a Key in Network Instance Group in A&AI",
-            "in": "path",
-            "name": "network-instance-group-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)networks",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)networks-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)networks-TOP"
-            }
-          }
-        },
-        "operationId": "PUT-networks"
+        "operationId": "PUT-aggregate-route-policy"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/aggregate-routes/{route-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -37356,9 +37723,9 @@
             "type": "string"
           },
           {
-            "description": "Index into network-topology-identifier structure",
+            "description": "Unique id",
             "in": "path",
-            "name": "network-id",
+            "name": "route-id",
             "required": true,
             "type": "string"
           }
@@ -37368,7 +37735,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-network"
+        "operationId": "DELETE-aggregate-routes"
       },
       "get": {
         "produces": [
@@ -37391,9 +37758,9 @@
             "type": "string"
           },
           {
-            "description": "Index into network-topology-identifier structure",
+            "description": "Unique id",
             "in": "path",
-            "name": "network-id",
+            "name": "route-id",
             "required": true,
             "type": "string"
           }
@@ -37402,13 +37769,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network"
+              "$ref": "#/definitions/(config)aggregate-routes"
             }
           }
         },
-        "operationId": "GET-network"
+        "operationId": "GET-aggregate-routes"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -37433,26 +37800,18 @@
             "type": "string"
           },
           {
-            "description": "Index into network-topology-identifier structure",
+            "description": "Unique id",
             "in": "path",
-            "name": "network-id",
+            "name": "route-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "**(config)customer-bonding-requests",
+            "name": "(config)aggregate-routes",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network(config)customer-bonding-requests-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)vpn-bindings",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network(config)vpn-bindings-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-routes-TOP"
             }
           }
         ],
@@ -37460,17 +37819,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)networkPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-routes-TOP"
             }
           }
         },
-        "operationId": "POST-network"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-aggregate-routes"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -37489,36 +37846,16 @@
             "name": "network-instance-group-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "Index into network-topology-identifier structure",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)network",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks(config)network-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks(config)network-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-network"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}/customer-bonding-requests": {
-      "delete": {
+        "operationId": "DELETE-networks"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -37537,23 +37874,23 @@
             "name": "network-instance-group-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "Index into network-topology-identifier structure",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)networks"
+            }
           }
         },
-        "operationId": "DELETE-customer-bonding-requests"
+        "operationId": "GET-networks"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -37574,24 +37911,25 @@
             "type": "string"
           },
           {
-            "description": "Index into network-topology-identifier structure",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)network",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks(config)network-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)customer-bonding-requests"
+              "$ref": "#/definitions/(config)networksPOST"
             }
           }
         },
-        "operationId": "GET-customer-bonding-requests"
+        "operationId": "POST-networks"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -37615,19 +37953,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "description": "Index into network-topology-identifier structure",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "**(config)customer-bonding-request",
+            "name": "(config)networks",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network/customer-bonding-requests(config)customer-bonding-request-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)networks-TOP"
             }
           }
         ],
@@ -37635,17 +37966,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)customer-bonding-requestsPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)networks-TOP"
             }
           }
         },
-        "operationId": "POST-customer-bonding-requests"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-networks"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -37671,29 +38000,16 @@
             "name": "network-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)customer-bonding-requests",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network(config)customer-bonding-requests-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network(config)customer-bonding-requests-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-customer-bonding-requests"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}/customer-bonding-requests/customer-bonding-request/{configuration-id}": {
-      "delete": {
+        "operationId": "DELETE-network"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -37719,23 +38035,23 @@
             "name": "network-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "e.g. vlan network receptor configuration id",
-            "in": "path",
-            "name": "configuration-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)network"
+            }
           }
         },
-        "operationId": "DELETE-customer-bonding-request"
+        "operationId": "GET-network"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -37763,22 +38079,31 @@
             "type": "string"
           },
           {
-            "description": "e.g. vlan network receptor configuration id",
-            "in": "path",
-            "name": "configuration-id",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)customer-bonding-requests",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network(config)customer-bonding-requests-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)vpn-bindings",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network(config)vpn-bindings-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)customer-bonding-request"
+              "$ref": "#/definitions/(config)networkPOST"
             }
           }
         },
-        "operationId": "GET-customer-bonding-request"
+        "operationId": "POST-network"
       },
       "put": {
         "consumes": [
@@ -37811,19 +38136,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "description": "e.g. vlan network receptor configuration id",
-            "in": "path",
-            "name": "configuration-id",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)customer-bonding-request",
+            "name": "(config)network",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network/customer-bonding-requests(config)customer-bonding-request-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks(config)network-TOP"
             }
           }
         ],
@@ -37831,14 +38149,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network/customer-bonding-requests(config)customer-bonding-request-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks(config)network-TOP"
             }
           }
         },
-        "operationId": "PUT-customer-bonding-request"
+        "operationId": "PUT-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}/vpn-bindings/{vpn-binding-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}/customer-bonding-requests": {
       "delete": {
         "produces": [
           "application/json",
@@ -37865,12 +38183,6 @@
             "name": "network-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vpn-binding-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -37878,7 +38190,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vpn-bindings"
+        "operationId": "DELETE-customer-bonding-requests"
       },
       "get": {
         "produces": [
@@ -37906,25 +38218,352 @@
             "name": "network-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vpn-binding-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vpn-bindings"
+              "$ref": "#/definitions/(config)customer-bonding-requests"
             }
           }
         },
-        "operationId": "GET-vpn-bindings"
+        "operationId": "GET-customer-bonding-requests"
       },
-      "put": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Also a Key in Network Instance Group in A&AI",
+            "in": "path",
+            "name": "network-instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Index into network-topology-identifier structure",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)customer-bonding-request",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network/customer-bonding-requests(config)customer-bonding-request-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)customer-bonding-requestsPOST"
+            }
+          }
+        },
+        "operationId": "POST-customer-bonding-requests"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Also a Key in Network Instance Group in A&AI",
+            "in": "path",
+            "name": "network-instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Index into network-topology-identifier structure",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)customer-bonding-requests",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network(config)customer-bonding-requests-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network(config)customer-bonding-requests-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-customer-bonding-requests"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}/customer-bonding-requests/customer-bonding-request/{configuration-id}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Also a Key in Network Instance Group in A&AI",
+            "in": "path",
+            "name": "network-instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Index into network-topology-identifier structure",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "e.g. vlan network receptor configuration id",
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-customer-bonding-request"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Also a Key in Network Instance Group in A&AI",
+            "in": "path",
+            "name": "network-instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Index into network-topology-identifier structure",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "e.g. vlan network receptor configuration id",
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)customer-bonding-request"
+            }
+          }
+        },
+        "operationId": "GET-customer-bonding-request"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Also a Key in Network Instance Group in A&AI",
+            "in": "path",
+            "name": "network-instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Index into network-topology-identifier structure",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "e.g. vlan network receptor configuration id",
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)customer-bonding-request",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network/customer-bonding-requests(config)customer-bonding-request-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group/networks/network/customer-bonding-requests(config)customer-bonding-request-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-customer-bonding-request"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/networks/network/{network-id}/vpn-bindings/{vpn-binding-id}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Also a Key in Network Instance Group in A&AI",
+            "in": "path",
+            "name": "network-instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Index into network-topology-identifier structure",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vpn-binding-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vpn-bindings"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Also a Key in Network Instance Group in A&AI",
+            "in": "path",
+            "name": "network-instance-group-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Index into network-topology-identifier structure",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vpn-binding-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vpn-bindings"
+            }
+          }
+        },
+        "operationId": "GET-vpn-bindings"
+      },
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -37981,7 +38620,7 @@
         "operationId": "PUT-vpn-bindings"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -38085,7 +38724,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/subnet-assignment-policy": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/subnet-assignment-policy": {
       "delete": {
         "produces": [
           "application/json",
@@ -38189,7 +38828,7 @@
         "operationId": "PUT-subnet-assignment-policy"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/subnets/{start-address}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/subnets/{start-address}": {
       "delete": {
         "produces": [
           "application/json",
@@ -38311,7 +38950,7 @@
         "operationId": "PUT-subnets"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/vpn-binding-policy": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/network-instance-groups/network-instance-group/{network-instance-group-id}/vpn-binding-policy": {
       "delete": {
         "produces": [
           "application/json",
@@ -38415,7 +39054,7 @@
         "operationId": "PUT-vpn-binding-policy"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -38534,7 +39173,7 @@
         "operationId": "PUT-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -38677,7 +39316,7 @@
         "operationId": "PUT-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -38776,18 +39415,18 @@
           },
           {
             "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"
             }
           },
           {
@@ -38876,7 +39515,7 @@
         "operationId": "PUT-network-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -39019,7 +39658,7 @@
         "operationId": "PUT-network-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -39120,7 +39759,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-level-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-level-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -39221,7 +39860,7 @@
         "operationId": "PUT-network-level-oper-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-provided-allotted-resources": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-provided-allotted-resources": {
       "delete": {
         "produces": [
           "application/json",
@@ -39322,7 +39961,7 @@
         "operationId": "PUT-network-provided-allotted-resources"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-request-input": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-request-input": {
       "delete": {
         "produces": [
           "application/json",
@@ -39465,7 +40104,7 @@
         "operationId": "PUT-network-request-input"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-request-input/network-input-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-request-input/network-input-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -39608,7 +40247,7 @@
         "operationId": "PUT-network-input-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-request-input/network-input-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-request-input/network-input-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -39775,7 +40414,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-request-input/network-input-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-request-input/network-input-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -39942,7 +40581,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-request-input/network-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-request-input/network-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -40079,7 +40718,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -40162,18 +40801,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)network-assignments",
+            "name": "**(config)network-parameters",
             "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-parameters-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"
             }
           },
           {
@@ -40246,7 +40885,7 @@
         "operationId": "PUT-network-topology"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -40347,7 +40986,7 @@
         "operationId": "PUT-network-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -40490,7 +41129,7 @@
         "operationId": "PUT-network-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-parameters/network-parameter/{network-parameter-name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-parameters/network-parameter/{network-parameter-name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -40609,7 +41248,7 @@
         "operationId": "PUT-network-parameter"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-topology-identifier-structure": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-topology-identifier-structure": {
       "delete": {
         "produces": [
           "application/json",
@@ -40752,7 +41391,7 @@
         "operationId": "PUT-network-topology-identifier-structure"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-topology-identifier-structure/related-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-topology-identifier-structure/related-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -40895,7 +41534,7 @@
         "operationId": "PUT-related-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -41066,7 +41705,7 @@
         "operationId": "PUT-related-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network/{network-id}/vlan-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network/{network-id}/vlan-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -41188,7 +41827,7 @@
         "operationId": "PUT-vlan-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-topology/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -41289,7 +41928,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/request-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/request-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -41390,7 +42029,7 @@
         "operationId": "PUT-request-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/sdnc-request-header": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -41491,7 +42130,7 @@
         "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/service-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -41634,7 +42273,7 @@
         "operationId": "PUT-service-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/service-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -41735,7 +42374,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-allotted-resources": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs": {
       "delete": {
         "produces": [
           "application/json",
@@ -41755,7 +42394,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-provided-allotted-resources"
+        "operationId": "DELETE-pnfs"
       },
       "get": {
         "produces": [
@@ -41775,11 +42414,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)provided-allotted-resources"
+              "$ref": "#/definitions/(config)pnfs"
             }
           }
         },
-        "operationId": "GET-provided-allotted-resources"
+        "operationId": "GET-pnfs"
       },
       "post": {
         "consumes": [
@@ -41800,10 +42439,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)provided-allotted-resource",
+            "name": "**(config)pnf",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-allotted-resources(config)provided-allotted-resource-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf-TOP"
             }
           }
         ],
@@ -41811,11 +42450,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)provided-allotted-resourcesPOST"
+              "$ref": "#/definitions/(config)pnfsPOST"
             }
           }
         },
-        "operationId": "POST-provided-allotted-resources"
+        "operationId": "POST-pnfs"
       },
       "put": {
         "consumes": [
@@ -41836,10 +42475,10 @@
           },
           {
             "in": "body",
-            "name": "(config)provided-allotted-resources",
+            "name": "(config)pnfs",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)provided-allotted-resources-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)pnfs-TOP"
             }
           }
         ],
@@ -41847,14 +42486,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)provided-allotted-resources-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)pnfs-TOP"
             }
           }
         },
-        "operationId": "PUT-provided-allotted-resources"
+        "operationId": "PUT-pnfs"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-allotted-resources/provided-allotted-resource/{allotted-resource-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -41870,7 +42509,7 @@
           },
           {
             "in": "path",
-            "name": "allotted-resource-id",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           }
@@ -41880,7 +42519,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-provided-allotted-resource"
+        "operationId": "DELETE-pnf"
       },
       "get": {
         "produces": [
@@ -41897,7 +42536,7 @@
           },
           {
             "in": "path",
-            "name": "allotted-resource-id",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           }
@@ -41906,13 +42545,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)provided-allotted-resource"
+              "$ref": "#/definitions/(config)pnf"
             }
           }
         },
-        "operationId": "GET-provided-allotted-resource"
+        "operationId": "GET-pnf"
       },
-      "put": {
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -41931,16 +42570,16 @@
           },
           {
             "in": "path",
-            "name": "allotted-resource-id",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)provided-allotted-resource",
+            "name": "**(config)pnf-data",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-allotted-resources(config)provided-allotted-resource-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf(config)pnf-data-TOP"
             }
           }
         ],
@@ -41948,60 +42587,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-allotted-resources(config)provided-allotted-resource-TOP"
-            }
-          }
-        },
-        "operationId": "PUT-provided-allotted-resource"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-configurations": {
-      "delete": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-provided-configurations"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)provided-configurations"
+              "$ref": "#/definitions/(config)pnfPOST"
             }
           }
         },
-        "operationId": "GET-provided-configurations"
+        "operationId": "POST-pnf"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -42019,47 +42611,17 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)provided-configuration",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-configurations(config)provided-configuration-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)provided-configurationsPOST"
-            }
-          }
-        },
-        "operationId": "POST-provided-configurations"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
             "in": "path",
-            "name": "service-instance-id",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)provided-configurations",
+            "name": "(config)pnf",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)provided-configurations-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf-TOP"
             }
           }
         ],
@@ -42067,14 +42629,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)provided-configurations-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf-TOP"
             }
           }
         },
-        "operationId": "PUT-provided-configurations"
+        "operationId": "PUT-pnf"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-configurations/provided-configuration/{configuration-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -42090,7 +42652,7 @@
           },
           {
             "in": "path",
-            "name": "configuration-id",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           }
@@ -42100,7 +42662,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-provided-configuration"
+        "operationId": "DELETE-pnf-data"
       },
       "get": {
         "produces": [
@@ -42117,7 +42679,7 @@
           },
           {
             "in": "path",
-            "name": "configuration-id",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           }
@@ -42126,13 +42688,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)provided-configuration"
+              "$ref": "#/definitions/(config)pnf-data"
             }
           }
         },
-        "operationId": "GET-provided-configuration"
+        "operationId": "GET-pnf-data"
       },
-      "put": {
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -42151,158 +42713,76 @@
           },
           {
             "in": "path",
-            "name": "configuration-id",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)provided-configuration",
+            "name": "**(config)pnf-topology",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-configurations(config)provided-configuration-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-topology-TOP"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
+          },
+          {
+            "in": "body",
+            "name": "**(config)pnf-level-oper-status",
+            "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-configurations(config)provided-configuration-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-level-oper-status-TOP"
             }
-          }
-        },
-        "operationId": "PUT-provided-configuration"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/request-information": {
-      "delete": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-request-information"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
+          },
           {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
+            "in": "body",
+            "name": "**(config)sdnc-request-header",
+            "required": false,
             "schema": {
-              "$ref": "#/definitions/(config)request-information"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)sdnc-request-header-TOP"
             }
-          }
-        },
-        "operationId": "GET-request-information"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)request-information",
+            "name": "**(config)request-information",
             "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/pnfs/pnf/pnf-data(config)request-information-TOP"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
+          },
+          {
+            "in": "body",
+            "name": "**(config)pnf-request-input",
+            "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/pnfs/pnf/pnf-data(config)pnf-request-input-TOP"
             }
-          }
-        },
-        "operationId": "PUT-request-information"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/sdnc-request-header": {
-      "delete": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
+          },
           {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-sdnc-request-header"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
+            "in": "body",
+            "name": "**(config)pnf-details",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-details-TOP"
+            }
+          },
           {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)service-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)service-information-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sdnc-request-header"
+              "$ref": "#/definitions/(config)pnf-dataPOST"
             }
           }
         },
-        "operationId": "GET-sdnc-request-header"
+        "operationId": "POST-pnf-data"
       },
       "put": {
         "consumes": [
@@ -42321,12 +42801,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)sdnc-request-header",
+            "name": "(config)pnf-data",
             "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/pnfs/pnf(config)pnf-data-TOP"
             }
           }
         ],
@@ -42334,14 +42820,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)sdnc-request-header-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf(config)pnf-data-TOP"
             }
           }
         },
-        "operationId": "PUT-sdnc-request-header"
+        "operationId": "PUT-pnf-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-details": {
       "delete": {
         "produces": [
           "application/json",
@@ -42354,6 +42840,12 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -42361,7 +42853,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-service-information"
+        "operationId": "DELETE-pnf-details"
       },
       "get": {
         "produces": [
@@ -42375,17 +42867,23 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-information"
+              "$ref": "#/definitions/(config)pnf-details"
             }
           }
         },
-        "operationId": "GET-service-information"
+        "operationId": "GET-pnf-details"
       },
       "post": {
         "consumes": [
@@ -42404,12 +42902,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
             "name": "**(config)onap-model-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-details(config)onap-model-information-TOP"
             }
           }
         ],
@@ -42417,11 +42921,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-informationPOST"
+              "$ref": "#/definitions/(config)pnf-detailsPOST"
             }
           }
         },
-        "operationId": "POST-service-information"
+        "operationId": "POST-pnf-details"
       },
       "put": {
         "consumes": [
@@ -42440,12 +42944,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)service-information",
+            "name": "(config)pnf-details",
             "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/pnfs/pnf/pnf-data(config)pnf-details-TOP"
             }
           }
         ],
@@ -42453,14 +42963,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-details-TOP"
             }
           }
         },
-        "operationId": "PUT-service-information"
+        "operationId": "PUT-pnf-details"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-details/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -42473,6 +42983,12 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -42494,6 +43010,12 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -42523,12 +43045,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
             "name": "(config)onap-model-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-details(config)onap-model-information-TOP"
             }
           }
         ],
@@ -42536,14 +43064,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-details(config)onap-model-information-TOP"
             }
           }
         },
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-level-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-level-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -42556,6 +43084,12 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -42563,7 +43097,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-service-level-oper-status"
+        "operationId": "DELETE-pnf-level-oper-status"
       },
       "get": {
         "produces": [
@@ -42577,17 +43111,23 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-level-oper-status"
+              "$ref": "#/definitions/(config)pnf-level-oper-status"
             }
           }
         },
-        "operationId": "GET-service-level-oper-status"
+        "operationId": "GET-pnf-level-oper-status"
       },
       "put": {
         "consumes": [
@@ -42606,12 +43146,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)service-level-oper-status",
+            "name": "(config)pnf-level-oper-status",
             "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/pnfs/pnf/pnf-data(config)pnf-level-oper-status-TOP"
             }
           }
         ],
@@ -42619,14 +43165,14 @@
           "200": {
             "description": "No response was specified",
             "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/pnfs/pnf/pnf-data(config)pnf-level-oper-status-TOP"
             }
           }
         },
-        "operationId": "PUT-service-level-oper-status"
+        "operationId": "PUT-pnf-level-oper-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-request-input": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-request-input": {
       "delete": {
         "produces": [
           "application/json",
@@ -42639,6 +43185,12 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -42646,7 +43198,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-service-request-input"
+        "operationId": "DELETE-pnf-request-input"
       },
       "get": {
         "produces": [
@@ -42660,17 +43212,23 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-request-input"
+              "$ref": "#/definitions/(config)pnf-request-input"
             }
           }
         },
-        "operationId": "GET-service-request-input"
+        "operationId": "GET-pnf-request-input"
       },
       "post": {
         "consumes": [
@@ -42689,12 +43247,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)service-input-parameters",
+            "name": "**(config)pnf-input-parameters",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input(config)service-input-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters-TOP"
             }
           }
         ],
@@ -42702,11 +43266,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-request-inputPOST"
+              "$ref": "#/definitions/(config)pnf-request-inputPOST"
             }
           }
         },
-        "operationId": "POST-service-request-input"
+        "operationId": "POST-pnf-request-input"
       },
       "put": {
         "consumes": [
@@ -42725,12 +43289,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)service-request-input",
+            "name": "(config)pnf-request-input",
             "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/pnfs/pnf/pnf-data(config)pnf-request-input-TOP"
             }
           }
         ],
@@ -42738,14 +43308,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-request-input-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-request-input-TOP"
             }
           }
         },
-        "operationId": "PUT-service-request-input"
+        "operationId": "PUT-pnf-request-input"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-request-input/service-input-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-request-input/pnf-input-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -42758,6 +43328,12 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -42765,7 +43341,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-service-input-parameters"
+        "operationId": "DELETE-pnf-input-parameters"
       },
       "get": {
         "produces": [
@@ -42779,17 +43355,23 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-input-parameters"
+              "$ref": "#/definitions/(config)pnf-input-parameters"
             }
           }
         },
-        "operationId": "GET-service-input-parameters"
+        "operationId": "GET-pnf-input-parameters"
       },
       "post": {
         "consumes": [
@@ -42808,12 +43390,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
             "name": "**(config)param",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters(config)param-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters(config)param-TOP"
             }
           }
         ],
@@ -42821,11 +43409,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-input-parametersPOST"
+              "$ref": "#/definitions/(config)pnf-input-parametersPOST"
             }
           }
         },
-        "operationId": "POST-service-input-parameters"
+        "operationId": "POST-pnf-input-parameters"
       },
       "put": {
         "consumes": [
@@ -42844,12 +43432,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)service-input-parameters",
+            "name": "(config)pnf-input-parameters",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input(config)service-input-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters-TOP"
             }
           }
         ],
@@ -42857,14 +43451,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input(config)service-input-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters-TOP"
             }
           }
         },
-        "operationId": "PUT-service-input-parameters"
+        "operationId": "PUT-pnf-input-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-request-input/service-input-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-request-input/pnf-input-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -42878,6 +43472,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -42905,6 +43505,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -42939,6 +43545,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -42950,7 +43562,7 @@
             "name": "**(config)resource-resolution-data",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param(config)resource-resolution-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data-TOP"
             }
           }
         ],
@@ -42981,6 +43593,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -42992,7 +43610,7 @@
             "name": "(config)param",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters(config)param-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters(config)param-TOP"
             }
           }
         ],
@@ -43000,14 +43618,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters(config)param-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters(config)param-TOP"
             }
           }
         },
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-request-input/service-input-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-request-input/pnf-input-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -43021,6 +43639,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -43048,6 +43672,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -43082,6 +43712,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -43093,7 +43729,7 @@
             "name": "**(config)resource-key",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         ],
@@ -43124,6 +43760,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -43135,7 +43777,7 @@
             "name": "(config)resource-resolution-data",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param(config)resource-resolution-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data-TOP"
             }
           }
         ],
@@ -43143,14 +43785,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param(config)resource-resolution-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data-TOP"
             }
           }
         },
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-request-input/service-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-request-input/pnf-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -43164,6 +43806,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -43197,6 +43845,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -43237,6 +43891,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -43254,7 +43914,7 @@
             "name": "(config)resource-key",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         ],
@@ -43262,14 +43922,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         },
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -43282,6 +43942,12 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -43289,7 +43955,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-service-topology"
+        "operationId": "DELETE-pnf-topology"
       },
       "get": {
         "produces": [
@@ -43303,17 +43969,23 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-topology"
+              "$ref": "#/definitions/(config)pnf-topology"
             }
           }
         },
-        "operationId": "GET-service-topology"
+        "operationId": "GET-pnf-topology"
       },
       "post": {
         "consumes": [
@@ -43333,35 +44005,33 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)service-topology-identifier",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-topology-identifier-TOP"
-            }
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           },
           {
             "in": "body",
-            "name": "**(config)onap-model-information",
+            "name": "**(config)pnf-parameters-data",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)service-assignments",
+            "name": "**(config)onap-model-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-assignments-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)onap-model-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)service-parameters",
+            "name": "**(config)pnf-topology-identifier-structure",
             "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/pnfs/pnf/pnf-data/pnf-topology(config)pnf-topology-identifier-structure-TOP"
             }
           }
         ],
@@ -43369,11 +44039,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-topologyPOST"
+              "$ref": "#/definitions/(config)pnf-topologyPOST"
             }
           }
         },
-        "operationId": "POST-service-topology"
+        "operationId": "POST-pnf-topology"
       },
       "put": {
         "consumes": [
@@ -43392,12 +44062,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)service-topology",
+            "name": "(config)pnf-topology",
             "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/pnfs/pnf/pnf-data(config)pnf-topology-TOP"
             }
           }
         ],
@@ -43405,14 +44081,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-topology-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-topology-TOP"
             }
           }
         },
-        "operationId": "PUT-service-topology"
+        "operationId": "PUT-pnf-topology"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-topology/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -43425,6 +44101,12 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -43446,6 +44128,12 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -43475,12 +44163,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
             "name": "(config)onap-model-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)onap-model-information-TOP"
             }
           }
         ],
@@ -43488,14 +44182,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)onap-model-information-TOP"
             }
           }
         },
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-topology/pnf-parameters-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -43508,44 +44202,22 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-service-assignments"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
+          },
           {
-            "description": "Keep as M",
             "in": "path",
-            "name": "service-instance-id",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)service-assignments"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-service-assignments"
+        "operationId": "DELETE-pnf-parameters-data"
       },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -43559,57 +44231,8 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "(config)service-assignments",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-assignments-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-assignments-TOP"
-            }
-          }
-        },
-        "operationId": "PUT-service-assignments"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-parameters": {
-      "delete": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-service-parameters"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
             "in": "path",
-            "name": "service-instance-id",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           }
@@ -43618,11 +44241,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-parameters"
+              "$ref": "#/definitions/(config)pnf-parameters-data"
             }
           }
         },
-        "operationId": "GET-service-parameters"
+        "operationId": "GET-pnf-parameters-data"
       },
       "post": {
         "consumes": [
@@ -43641,12 +44264,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)service-parameter",
+            "name": "**(config)param",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology/service-parameters(config)service-parameter-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param-TOP"
             }
           }
         ],
@@ -43654,11 +44283,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-parametersPOST"
+              "$ref": "#/definitions/(config)pnf-parameters-dataPOST"
             }
           }
         },
-        "operationId": "POST-service-parameters"
+        "operationId": "POST-pnf-parameters-data"
       },
       "put": {
         "consumes": [
@@ -43677,12 +44306,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)service-parameters",
+            "name": "(config)pnf-parameters-data",
             "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/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data-TOP"
             }
           }
         ],
@@ -43690,14 +44325,14 @@
           "200": {
             "description": "No response was specified",
             "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/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data-TOP"
             }
           }
         },
-        "operationId": "PUT-service-parameters"
+        "operationId": "PUT-pnf-parameters-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-parameters/service-parameter/{service-parameter-name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-topology/pnf-parameters-data/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -43713,7 +44348,13 @@
           },
           {
             "in": "path",
-            "name": "service-parameter-name",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
             "required": true,
             "type": "string"
           }
@@ -43723,7 +44364,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-service-parameter"
+        "operationId": "DELETE-param"
       },
       "get": {
         "produces": [
@@ -43740,7 +44381,13 @@
           },
           {
             "in": "path",
-            "name": "service-parameter-name",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
             "required": true,
             "type": "string"
           }
@@ -43749,13 +44396,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-parameter"
+              "$ref": "#/definitions/(config)param"
             }
           }
         },
-        "operationId": "GET-service-parameter"
+        "operationId": "GET-param"
       },
-      "put": {
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -43774,16 +44421,22 @@
           },
           {
             "in": "path",
-            "name": "service-parameter-name",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)service-parameter",
+            "name": "**(config)resource-resolution-data",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology/service-parameters(config)service-parameter-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param(config)resource-resolution-data-TOP"
             }
           }
         ],
@@ -43791,15 +44444,17 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology/service-parameters(config)service-parameter-TOP"
+              "$ref": "#/definitions/(config)paramPOST"
             }
           }
         },
-        "operationId": "PUT-service-parameter"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-topology-identifier": {
-      "delete": {
+        "operationId": "POST-param"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -43811,62 +44466,25 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-service-topology-identifier"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
+          },
           {
-            "description": "Keep as M",
             "in": "path",
-            "name": "service-instance-id",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)service-topology-identifier"
-            }
-          }
-        },
-        "operationId": "GET-service-topology-identifier"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
+          },
           {
-            "description": "Keep as M",
             "in": "path",
-            "name": "service-instance-id",
+            "name": "name",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)service-topology-identifier",
+            "name": "(config)param",
             "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/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param-TOP"
             }
           }
         ],
@@ -43874,14 +44492,14 @@
           "200": {
             "description": "No response was specified",
             "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/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param-TOP"
             }
           }
         },
-        "operationId": "PUT-service-topology-identifier"
+        "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-topology/pnf-parameters-data/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -43894,6 +44512,18 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -43901,7 +44531,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc-instance-groups"
+        "operationId": "DELETE-resource-resolution-data"
       },
       "get": {
         "produces": [
@@ -43915,17 +44545,29 @@
             "name": "service-instance-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-instance-groups"
+              "$ref": "#/definitions/(config)resource-resolution-data"
             }
           }
         },
-        "operationId": "GET-vnfc-instance-groups"
+        "operationId": "GET-resource-resolution-data"
       },
       "post": {
         "consumes": [
@@ -43944,12 +44586,24 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vnfc-instance-group",
+            "name": "**(config)resource-key",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfc-instance-groups(config)vnfc-instance-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         ],
@@ -43957,11 +44611,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-instance-groupsPOST"
+              "$ref": "#/definitions/(config)resource-resolution-dataPOST"
             }
           }
         },
-        "operationId": "POST-vnfc-instance-groups"
+        "operationId": "POST-resource-resolution-data"
       },
       "put": {
         "consumes": [
@@ -43980,12 +44634,24 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnfc-instance-groups",
+            "name": "(config)resource-resolution-data",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)vnfc-instance-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param(config)resource-resolution-data-TOP"
             }
           }
         ],
@@ -43993,14 +44659,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)vnfc-instance-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param(config)resource-resolution-data-TOP"
             }
           }
         },
-        "operationId": "PUT-vnfc-instance-groups"
+        "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-topology/pnf-parameters-data/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -44015,22 +44681,20 @@
             "type": "string"
           },
           {
-            "description": "i.e.TSBC_VNFC_group",
             "in": "path",
-            "name": "instance-group-role",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Set to nfc-naming-code from A&AI",
             "in": "path",
-            "name": "nfc-naming-code",
+            "name": "name",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "configuration-id",
+            "name": "name",
             "required": true,
             "type": "string"
           }
@@ -44040,7 +44704,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc-instance-group"
+        "operationId": "DELETE-resource-key"
       },
       "get": {
         "produces": [
@@ -44056,22 +44720,20 @@
             "type": "string"
           },
           {
-            "description": "i.e.TSBC_VNFC_group",
             "in": "path",
-            "name": "instance-group-role",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Set to nfc-naming-code from A&AI",
             "in": "path",
-            "name": "nfc-naming-code",
+            "name": "name",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "configuration-id",
+            "name": "name",
             "required": true,
             "type": "string"
           }
@@ -44080,13 +44742,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-instance-group"
+              "$ref": "#/definitions/(config)resource-key"
             }
           }
         },
-        "operationId": "GET-vnfc-instance-group"
+        "operationId": "GET-resource-key"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -44104,31 +44766,29 @@
             "type": "string"
           },
           {
-            "description": "i.e.TSBC_VNFC_group",
             "in": "path",
-            "name": "instance-group-role",
+            "name": "pnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Set to nfc-naming-code from A&AI",
             "in": "path",
-            "name": "nfc-naming-code",
+            "name": "name",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "configuration-id",
+            "name": "name",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "**(config)vnfc-objects",
+            "name": "(config)resource-key",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfc-instance-groups/vnfc-instance-group(config)vnfc-objects-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         ],
@@ -44136,16 +44796,2971 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-instance-groupPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         },
-        "operationId": "POST-vnfc-instance-group"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
+        "operationId": "PUT-resource-key"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-topology/pnf-topology-identifier-structure": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-pnf-topology-identifier-structure"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)pnf-topology-identifier-structure"
+            }
+          }
+        },
+        "operationId": "GET-pnf-topology-identifier-structure"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)pnf-topology-identifier-structure",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-topology-identifier-structure-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-topology-identifier-structure-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-pnf-topology-identifier-structure"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/request-information": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-request-information"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)request-information"
+            }
+          }
+        },
+        "operationId": "GET-request-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)request-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)request-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)request-information-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-request-information"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/sdnc-request-header": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-sdnc-request-header"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)sdnc-request-header"
+            }
+          }
+        },
+        "operationId": "GET-sdnc-request-header"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)sdnc-request-header",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)sdnc-request-header-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)sdnc-request-header-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-sdnc-request-header"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/service-information": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-service-information"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-information"
+            }
+          }
+        },
+        "operationId": "GET-service-information"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)onap-model-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/service-information(config)onap-model-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-informationPOST"
+            }
+          }
+        },
+        "operationId": "POST-service-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)service-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)service-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)service-information-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-service-information"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/service-information/onap-model-information": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-onap-model-information"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)onap-model-information"
+            }
+          }
+        },
+        "operationId": "GET-onap-model-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)onap-model-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/service-information(config)onap-model-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/service-information(config)onap-model-information-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-onap-model-information"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-allotted-resources": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-provided-allotted-resources"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)provided-allotted-resources"
+            }
+          }
+        },
+        "operationId": "GET-provided-allotted-resources"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)provided-allotted-resource",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-allotted-resources(config)provided-allotted-resource-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)provided-allotted-resourcesPOST"
+            }
+          }
+        },
+        "operationId": "POST-provided-allotted-resources"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)provided-allotted-resources",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)provided-allotted-resources-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)provided-allotted-resources-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-provided-allotted-resources"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-allotted-resources/provided-allotted-resource/{allotted-resource-id}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "allotted-resource-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-provided-allotted-resource"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "allotted-resource-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)provided-allotted-resource"
+            }
+          }
+        },
+        "operationId": "GET-provided-allotted-resource"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "allotted-resource-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)provided-allotted-resource",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-allotted-resources(config)provided-allotted-resource-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-allotted-resources(config)provided-allotted-resource-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-provided-allotted-resource"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-configurations": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-provided-configurations"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)provided-configurations"
+            }
+          }
+        },
+        "operationId": "GET-provided-configurations"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)provided-configuration",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-configurations(config)provided-configuration-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)provided-configurationsPOST"
+            }
+          }
+        },
+        "operationId": "POST-provided-configurations"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)provided-configurations",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)provided-configurations-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)provided-configurations-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-provided-configurations"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-configurations/provided-configuration/{configuration-id}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-provided-configuration"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)provided-configuration"
+            }
+          }
+        },
+        "operationId": "GET-provided-configuration"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)provided-configuration",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-configurations(config)provided-configuration-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/provided-configurations(config)provided-configuration-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-provided-configuration"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/request-information": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-request-information"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)request-information"
+            }
+          }
+        },
+        "operationId": "GET-request-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)request-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)request-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)request-information-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-request-information"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/sdnc-request-header": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-sdnc-request-header"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)sdnc-request-header"
+            }
+          }
+        },
+        "operationId": "GET-sdnc-request-header"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)sdnc-request-header",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)sdnc-request-header-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)sdnc-request-header-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-sdnc-request-header"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-information": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-service-information"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-information"
+            }
+          }
+        },
+        "operationId": "GET-service-information"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)onap-model-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-information(config)onap-model-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-informationPOST"
+            }
+          }
+        },
+        "operationId": "POST-service-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)service-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-information-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-service-information"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-information/onap-model-information": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-onap-model-information"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)onap-model-information"
+            }
+          }
+        },
+        "operationId": "GET-onap-model-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)onap-model-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-information(config)onap-model-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-information(config)onap-model-information-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-onap-model-information"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-level-oper-status": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-service-level-oper-status"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-level-oper-status"
+            }
+          }
+        },
+        "operationId": "GET-service-level-oper-status"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)service-level-oper-status",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-level-oper-status-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-level-oper-status-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-service-level-oper-status"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-request-input": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-service-request-input"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-request-input"
+            }
+          }
+        },
+        "operationId": "GET-service-request-input"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)service-input-parameters",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input(config)service-input-parameters-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-request-inputPOST"
+            }
+          }
+        },
+        "operationId": "POST-service-request-input"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)service-request-input",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-request-input-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-request-input-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-service-request-input"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-request-input/service-input-parameters": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-service-input-parameters"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-input-parameters"
+            }
+          }
+        },
+        "operationId": "GET-service-input-parameters"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)param",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters(config)param-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-input-parametersPOST"
+            }
+          }
+        },
+        "operationId": "POST-service-input-parameters"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)service-input-parameters",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input(config)service-input-parameters-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input(config)service-input-parameters-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-service-input-parameters"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-request-input/service-input-parameters/param/{name}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-param"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)param"
+            }
+          }
+        },
+        "operationId": "GET-param"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)resource-resolution-data",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param(config)resource-resolution-data-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)paramPOST"
+            }
+          }
+        },
+        "operationId": "POST-param"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)param",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters(config)param-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters(config)param-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-param"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-request-input/service-input-parameters/param/{name}/resource-resolution-data": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-resource-resolution-data"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)resource-resolution-data"
+            }
+          }
+        },
+        "operationId": "GET-resource-resolution-data"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)resource-key",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)resource-resolution-dataPOST"
+            }
+          }
+        },
+        "operationId": "POST-resource-resolution-data"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)resource-resolution-data",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param(config)resource-resolution-data-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param(config)resource-resolution-data-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-resource-resolution-data"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-request-input/service-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-resource-key"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)resource-key"
+            }
+          }
+        },
+        "operationId": "GET-resource-key"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)resource-key",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-request-input/service-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-resource-key"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-service-topology"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-topology"
+            }
+          }
+        },
+        "operationId": "GET-service-topology"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)service-parameters",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-parameters-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)onap-model-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)onap-model-information-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)service-assignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-assignments-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)service-topology-identifier",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-topology-identifier-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-topologyPOST"
+            }
+          }
+        },
+        "operationId": "POST-service-topology"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)service-topology",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-topology-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)service-topology-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-service-topology"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/onap-model-information": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-onap-model-information"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)onap-model-information"
+            }
+          }
+        },
+        "operationId": "GET-onap-model-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)onap-model-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)onap-model-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)onap-model-information-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-onap-model-information"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-assignments": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-service-assignments"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-assignments"
+            }
+          }
+        },
+        "operationId": "GET-service-assignments"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)service-assignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-assignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-assignments-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-service-assignments"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-parameters": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-service-parameters"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-parameters"
+            }
+          }
+        },
+        "operationId": "GET-service-parameters"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)service-parameter",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology/service-parameters(config)service-parameter-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-parametersPOST"
+            }
+          }
+        },
+        "operationId": "POST-service-parameters"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)service-parameters",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-parameters-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-parameters-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-service-parameters"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-parameters/service-parameter/{service-parameter-name}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "service-parameter-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-service-parameter"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "service-parameter-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-parameter"
+            }
+          }
+        },
+        "operationId": "GET-service-parameter"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "service-parameter-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)service-parameter",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology/service-parameters(config)service-parameter-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology/service-parameters(config)service-parameter-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-service-parameter"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-topology-identifier": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-service-topology-identifier"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-topology-identifier"
+            }
+          }
+        },
+        "operationId": "GET-service-topology-identifier"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)service-topology-identifier",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-topology-identifier-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-topology-identifier-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-service-topology-identifier"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-instance-groups"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-instance-groups"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-instance-groups"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-instance-group",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfc-instance-groups(config)vnfc-instance-group-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-instance-groupsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-instance-groups"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-instance-groups",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)vnfc-instance-groups-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)vnfc-instance-groups-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-instance-groups"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "i.e.TSBC_VNFC_group",
+            "in": "path",
+            "name": "instance-group-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Set to nfc-naming-code from A&AI",
+            "in": "path",
+            "name": "nfc-naming-code",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-instance-group"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "i.e.TSBC_VNFC_group",
+            "in": "path",
+            "name": "instance-group-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Set to nfc-naming-code from A&AI",
+            "in": "path",
+            "name": "nfc-naming-code",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-instance-group"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-instance-group"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "i.e.TSBC_VNFC_group",
+            "in": "path",
+            "name": "instance-group-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Set to nfc-naming-code from A&AI",
+            "in": "path",
+            "name": "nfc-naming-code",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-objects",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfc-instance-groups/vnfc-instance-group(config)vnfc-objects-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-instance-groupPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-instance-group"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
         ],
         "produces": [
           "application/json",
@@ -44199,7 +47814,7 @@
         "operationId": "PUT-vnfc-instance-group"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects": {
       "delete": {
         "produces": [
           "application/json",
@@ -44398,7 +48013,7 @@
         "operationId": "PUT-vnfc-objects"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}": {
       "delete": {
         "produces": [
           "application/json",
@@ -44621,7 +48236,7 @@
         "operationId": "PUT-vnfc-object"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}/vnics": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}/vnics": {
       "delete": {
         "produces": [
           "application/json",
@@ -44844,7 +48459,7 @@
         "operationId": "PUT-vnics"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}/vnics/vnic/{vnic-port-name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}/vnics/vnic/{vnic-port-name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -45099,7 +48714,7 @@
         "operationId": "PUT-vnic"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}/vnics/vnic/{vnic-port-name}/capacity": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}/vnics/vnic/{vnic-port-name}/capacity": {
       "delete": {
         "produces": [
           "application/json",
@@ -45278,7 +48893,7 @@
         "operationId": "PUT-capacity"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}/vnics/vnic/{vnic-port-name}/vnic-ip-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}/vnics/vnic/{vnic-port-name}/vnic-ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -45525,7 +49140,7 @@
         "operationId": "PUT-vnic-ip-addresses"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}/vnics/vnic/{vnic-port-name}/vnic-ip-addresses/ip-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}/vnfc-objects/vnfc-object/{vnfc-key}/vnics/vnic/{vnic-port-name}/vnic-ip-addresses/ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -45704,7 +49319,7 @@
         "operationId": "PUT-ip-addresses"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs": {
       "delete": {
         "produces": [
           "application/json",
@@ -45823,7 +49438,7 @@
         "operationId": "PUT-vnfs"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -45966,7 +49581,7 @@
         "operationId": "PUT-vnf"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -46089,34 +49704,26 @@
           },
           {
             "in": "body",
-            "name": "**(config)vnf-topology",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-topology-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)request-information",
+            "name": "**(config)license-information",
             "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)license-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)license-information",
+            "name": "**(config)sdnc-request-header",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)license-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-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/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"
             }
           },
           {
@@ -46142,6 +49749,14 @@
             "schema": {
               "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-request-input-TOP"
             }
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnf-topology",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-topology-TOP"
+            }
           }
         ],
         "responses": {
@@ -46197,7 +49812,7 @@
         "operationId": "PUT-vnf-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/license-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/license-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -46330,10 +49945,385 @@
           },
           {
             "in": "body",
-            "name": "(config)license-information",
+            "name": "(config)license-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)license-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)license-information-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-license-information"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/license-information/entitlement-pool-list/{entitlement-pool-uuid}/{action}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "entitlement-pool-uuid",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "action",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-entitlement-pool-list"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "entitlement-pool-uuid",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "action",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)entitlement-pool-list"
+            }
+          }
+        },
+        "operationId": "GET-entitlement-pool-list"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "entitlement-pool-uuid",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "action",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)entitlement-pool-list",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/license-information(config)entitlement-pool-list-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/license-information(config)entitlement-pool-list-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-entitlement-pool-list"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/license-information/license-key-group-list/{license-key-group-uuid}/{action}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "license-key-group-uuid",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "action",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-license-key-group-list"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "license-key-group-uuid",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "action",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)license-key-group-list"
+            }
+          }
+        },
+        "operationId": "GET-license-key-group-list"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "license-key-group-uuid",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "action",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)license-key-group-list",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/license-information(config)license-key-group-list-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/license-information(config)license-key-group-list-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-license-key-group-list"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/request-information": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-request-information"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)request-information"
+            }
+          }
+        },
+        "operationId": "GET-request-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)request-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)license-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)request-information-TOP"
             }
           }
         ],
@@ -46341,14 +50331,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)license-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)request-information-TOP"
             }
           }
         },
-        "operationId": "PUT-license-information"
+        "operationId": "PUT-request-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/license-information/entitlement-pool-list/{entitlement-pool-uuid}/{action}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -46367,18 +50357,6 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "entitlement-pool-uuid",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "action",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -46386,7 +50364,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-entitlement-pool-list"
+        "operationId": "DELETE-sdnc-request-header"
       },
       "get": {
         "produces": [
@@ -46406,29 +50384,17 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "entitlement-pool-uuid",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "action",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)entitlement-pool-list"
+              "$ref": "#/definitions/(config)sdnc-request-header"
             }
           }
         },
-        "operationId": "GET-entitlement-pool-list"
+        "operationId": "GET-sdnc-request-header"
       },
       "put": {
         "consumes": [
@@ -46453,24 +50419,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "entitlement-pool-uuid",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "action",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)entitlement-pool-list",
+            "name": "(config)sdnc-request-header",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/license-information(config)entitlement-pool-list-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)sdnc-request-header-TOP"
             }
           }
         ],
@@ -46478,14 +50432,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/license-information(config)entitlement-pool-list-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)sdnc-request-header-TOP"
             }
           }
         },
-        "operationId": "PUT-entitlement-pool-list"
+        "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/license-information/license-key-group-list/{license-key-group-uuid}/{action}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -46504,18 +50458,6 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "license-key-group-uuid",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "action",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -46523,7 +50465,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-license-key-group-list"
+        "operationId": "DELETE-service-information"
       },
       "get": {
         "produces": [
@@ -46543,31 +50485,19 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "license-key-group-uuid",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "action",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)license-key-group-list"
+              "$ref": "#/definitions/(config)service-information"
             }
           }
         },
-        "operationId": "GET-license-key-group-list"
+        "operationId": "GET-service-information"
       },
-      "put": {
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -46591,23 +50521,53 @@
             "type": "string"
           },
           {
+            "in": "body",
+            "name": "**(config)onap-model-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/service-information(config)onap-model-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)service-informationPOST"
+            }
+          }
+        },
+        "operationId": "POST-service-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
             "in": "path",
-            "name": "license-key-group-uuid",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "action",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)license-key-group-list",
+            "name": "(config)service-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/license-information(config)license-key-group-list-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)service-information-TOP"
             }
           }
         ],
@@ -46615,14 +50575,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/license-information(config)license-key-group-list-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)service-information-TOP"
             }
           }
         },
-        "operationId": "PUT-license-key-group-list"
+        "operationId": "PUT-service-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/request-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -46648,7 +50608,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-request-information"
+        "operationId": "DELETE-onap-model-information"
       },
       "get": {
         "produces": [
@@ -46674,11 +50634,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)request-information"
+              "$ref": "#/definitions/(config)onap-model-information"
             }
           }
         },
-        "operationId": "GET-request-information"
+        "operationId": "GET-onap-model-information"
       },
       "put": {
         "consumes": [
@@ -46705,10 +50665,10 @@
           },
           {
             "in": "body",
-            "name": "(config)request-information",
+            "name": "(config)onap-model-information",
             "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/service-information(config)onap-model-information-TOP"
             }
           }
         ],
@@ -46716,14 +50676,14 @@
           "200": {
             "description": "No response was specified",
             "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/service-information(config)onap-model-information-TOP"
             }
           }
         },
-        "operationId": "PUT-request-information"
+        "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/sdnc-request-header": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules": {
       "delete": {
         "produces": [
           "application/json",
@@ -46749,7 +50709,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-sdnc-request-header"
+        "operationId": "DELETE-vf-modules"
       },
       "get": {
         "produces": [
@@ -46775,11 +50735,53 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sdnc-request-header"
+              "$ref": "#/definitions/(config)vf-modules"
             }
           }
         },
-        "operationId": "GET-sdnc-request-header"
+        "operationId": "GET-vf-modules"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vf-module",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules(config)vf-module-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vf-modulesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vf-modules"
       },
       "put": {
         "consumes": [
@@ -46806,10 +50808,10 @@
           },
           {
             "in": "body",
-            "name": "(config)sdnc-request-header",
+            "name": "(config)vf-modules",
             "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)vf-modules-TOP"
             }
           }
         ],
@@ -46817,14 +50819,14 @@
           "200": {
             "description": "No response was specified",
             "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)vf-modules-TOP"
             }
           }
         },
-        "operationId": "PUT-sdnc-request-header"
+        "operationId": "PUT-vf-modules"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/service-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -46843,6 +50845,12 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -46850,7 +50858,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-service-information"
+        "operationId": "DELETE-vf-module"
       },
       "get": {
         "produces": [
@@ -46870,17 +50878,23 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-information"
+              "$ref": "#/definitions/(config)vf-module"
             }
           }
         },
-        "operationId": "GET-service-information"
+        "operationId": "GET-vf-module"
       },
       "post": {
         "consumes": [
@@ -46905,12 +50919,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)onap-model-information",
+            "name": "**(config)vf-module-data",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/service-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module(config)vf-module-data-TOP"
             }
           }
         ],
@@ -46918,11 +50938,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-informationPOST"
+              "$ref": "#/definitions/(config)vf-modulePOST"
             }
           }
         },
-        "operationId": "POST-service-information"
+        "operationId": "POST-vf-module"
       },
       "put": {
         "consumes": [
@@ -46947,12 +50967,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)service-information",
+            "name": "(config)vf-module",
             "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/vf-modules(config)vf-module-TOP"
             }
           }
         ],
@@ -46960,14 +50986,14 @@
           "200": {
             "description": "No response was specified",
             "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/vf-modules(config)vf-module-TOP"
             }
           }
         },
-        "operationId": "PUT-service-information"
+        "operationId": "PUT-vf-module"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/service-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -46986,6 +51012,12 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -46993,7 +51025,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-onap-model-information"
+        "operationId": "DELETE-vf-module-data"
       },
       "get": {
         "produces": [
@@ -47013,19 +51045,25 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)onap-model-information"
+              "$ref": "#/definitions/(config)vf-module-data"
             }
           }
         },
-        "operationId": "GET-onap-model-information"
+        "operationId": "GET-vf-module-data"
       },
-      "put": {
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -47048,12 +51086,74 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)onap-model-information",
+            "name": "**(config)vf-module-level-oper-status",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/service-information(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(config)vf-module-level-oper-status-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "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)request-information-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "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)sdnc-request-header-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "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-information-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "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)vnf-information-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "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)service-information-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "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)vf-module-request-input-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)vf-module-topology",
+            "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-topology-TOP"
             }
           }
         ],
@@ -47061,15 +51161,17 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/service-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/(config)vf-module-dataPOST"
             }
           }
         },
-        "operationId": "PUT-onap-model-information"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules": {
-      "delete": {
+        "operationId": "POST-vf-module-data"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -47087,50 +51189,35 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-vf-modules"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
+          },
           {
-            "description": "Keep as M",
             "in": "path",
-            "name": "service-instance-id",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           },
           {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "(config)vf-module-data",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module(config)vf-module-data-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-modules"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module(config)vf-module-data-TOP"
             }
           }
         },
-        "operationId": "GET-vf-modules"
-      },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-vf-module-data"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/request-information": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -47150,29 +51237,20 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)vf-module",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules(config)vf-module-TOP"
-            }
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)vf-modulesPOST"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "POST-vf-modules"
+        "operationId": "DELETE-request-information"
       },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -47192,27 +51270,27 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "(config)vf-modules",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vf-modules-TOP"
-            }
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vf-modules-TOP"
+              "$ref": "#/definitions/(config)request-information"
             }
           }
         },
-        "operationId": "PUT-vf-modules"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}": {
-      "delete": {
+        "operationId": "GET-request-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -47236,16 +51314,29 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "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)request-information-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "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"
+            }
           }
         },
-        "operationId": "DELETE-vf-module"
-      },
-      "get": {
+        "operationId": "PUT-request-information"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/sdnc-request-header": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -47273,19 +51364,12 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)vf-module"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-vf-module"
+        "operationId": "DELETE-sdnc-request-header"
       },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -47309,25 +51393,17 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "**(config)vf-module-data",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module(config)vf-module-data-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-modulePOST"
+              "$ref": "#/definitions/(config)sdnc-request-header"
             }
           }
         },
-        "operationId": "POST-vf-module"
+        "operationId": "GET-sdnc-request-header"
       },
       "put": {
         "consumes": [
@@ -47360,10 +51436,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vf-module",
+            "name": "(config)sdnc-request-header",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules(config)vf-module-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"
             }
           }
         ],
@@ -47371,14 +51447,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules(config)vf-module-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"
             }
           }
         },
-        "operationId": "PUT-vf-module"
+        "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -47410,7 +51486,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vf-module-data"
+        "operationId": "DELETE-service-information"
       },
       "get": {
         "produces": [
@@ -47442,11 +51518,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-data"
+              "$ref": "#/definitions/(config)service-information"
             }
           }
         },
-        "operationId": "GET-vf-module-data"
+        "operationId": "GET-service-information"
       },
       "post": {
         "consumes": [
@@ -47479,114 +51555,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vf-module-level-oper-status",
-            "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-level-oper-status-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "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)sdnc-request-header-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "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)request-information-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "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)vf-module-request-input-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "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-information-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "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)service-information-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "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)vnf-information-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)vf-module-topology",
-            "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-topology-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)vf-module-dataPOST"
-            }
-          }
-        },
-        "operationId": "POST-vf-module-data"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)vf-module-data",
+            "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(config)vf-module-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/service-information(config)onap-model-information-TOP"
             }
           }
         ],
@@ -47594,82 +51566,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module(config)vf-module-data-TOP"
-            }
-          }
-        },
-        "operationId": "PUT-vf-module-data"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/request-information": {
-      "delete": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-request-information"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)request-information"
+              "$ref": "#/definitions/(config)service-informationPOST"
             }
           }
         },
-        "operationId": "GET-request-information"
+        "operationId": "POST-service-information"
       },
       "put": {
         "consumes": [
@@ -47702,10 +51603,10 @@
           },
           {
             "in": "body",
-            "name": "(config)request-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)request-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"
             }
           }
         ],
@@ -47713,14 +51614,14 @@
           "200": {
             "description": "No response was specified",
             "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)service-information-TOP"
             }
           }
         },
-        "operationId": "PUT-request-information"
+        "operationId": "PUT-service-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/sdnc-request-header": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -47752,7 +51653,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-sdnc-request-header"
+        "operationId": "DELETE-onap-model-information"
       },
       "get": {
         "produces": [
@@ -47784,11 +51685,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sdnc-request-header"
+              "$ref": "#/definitions/(config)onap-model-information"
             }
           }
         },
-        "operationId": "GET-sdnc-request-header"
+        "operationId": "GET-onap-model-information"
       },
       "put": {
         "consumes": [
@@ -47821,10 +51722,10 @@
           },
           {
             "in": "body",
-            "name": "(config)sdnc-request-header",
+            "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(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/service-information(config)onap-model-information-TOP"
             }
           }
         ],
@@ -47832,14 +51733,14 @@
           "200": {
             "description": "No response was specified",
             "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/service-information(config)onap-model-information-TOP"
             }
           }
         },
-        "operationId": "PUT-sdnc-request-header"
+        "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/service-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -47871,7 +51772,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-service-information"
+        "operationId": "DELETE-vf-module-information"
       },
       "get": {
         "produces": [
@@ -47903,11 +51804,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-information"
+              "$ref": "#/definitions/(config)vf-module-information"
             }
           }
         },
-        "operationId": "GET-service-information"
+        "operationId": "GET-vf-module-information"
       },
       "post": {
         "consumes": [
@@ -47943,7 +51844,7 @@
             "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/service-information(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-information(config)onap-model-information-TOP"
             }
           }
         ],
@@ -47951,11 +51852,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)service-informationPOST"
+              "$ref": "#/definitions/(config)vf-module-informationPOST"
             }
           }
         },
-        "operationId": "POST-service-information"
+        "operationId": "POST-vf-module-information"
       },
       "put": {
         "consumes": [
@@ -47988,10 +51889,10 @@
           },
           {
             "in": "body",
-            "name": "(config)service-information",
+            "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)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-information-TOP"
             }
           }
         ],
@@ -47999,14 +51900,14 @@
           "200": {
             "description": "No response was specified",
             "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-information-TOP"
             }
           }
         },
-        "operationId": "PUT-service-information"
+        "operationId": "PUT-vf-module-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/service-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -48110,7 +52011,7 @@
             "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/service-information(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-information(config)onap-model-information-TOP"
             }
           }
         ],
@@ -48118,14 +52019,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/service-information(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-information(config)onap-model-information-TOP"
             }
           }
         },
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-level-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -48157,7 +52058,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vf-module-information"
+        "operationId": "DELETE-vf-module-level-oper-status"
       },
       "get": {
         "produces": [
@@ -48189,13 +52090,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-information"
+              "$ref": "#/definitions/(config)vf-module-level-oper-status"
             }
           }
         },
-        "operationId": "GET-vf-module-information"
+        "operationId": "GET-vf-module-level-oper-status"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -48226,10 +52127,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)onap-model-information",
+            "name": "(config)vf-module-level-oper-status",
             "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-information(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(config)vf-module-level-oper-status-TOP"
             }
           }
         ],
@@ -48237,17 +52138,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-informationPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-level-oper-status-TOP"
             }
           }
         },
-        "operationId": "POST-vf-module-information"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-vf-module-level-oper-status"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-request-input": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -48271,29 +52170,16 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "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-information-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "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"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-vf-module-information"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-information/onap-model-information": {
-      "delete": {
+        "operationId": "DELETE-vf-module-request-input"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -48321,12 +52207,19 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vf-module-request-input"
+            }
           }
         },
-        "operationId": "DELETE-onap-model-information"
+        "operationId": "GET-vf-module-request-input"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -48350,17 +52243,25 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vf-module-input-parameters",
+            "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-request-input(config)vf-module-input-parameters-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)onap-model-information"
+              "$ref": "#/definitions/(config)vf-module-request-inputPOST"
             }
           }
         },
-        "operationId": "GET-onap-model-information"
+        "operationId": "POST-vf-module-request-input"
       },
       "put": {
         "consumes": [
@@ -48393,10 +52294,10 @@
           },
           {
             "in": "body",
-            "name": "(config)onap-model-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/vf-module-information(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(config)vf-module-request-input-TOP"
             }
           }
         ],
@@ -48404,14 +52305,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-information(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(config)vf-module-request-input-TOP"
             }
           }
         },
-        "operationId": "PUT-onap-model-information"
+        "operationId": "PUT-vf-module-request-input"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-level-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-request-input/vf-module-input-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -48443,7 +52344,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vf-module-level-oper-status"
+        "operationId": "DELETE-vf-module-input-parameters"
       },
       "get": {
         "produces": [
@@ -48475,11 +52376,59 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-level-oper-status"
+              "$ref": "#/definitions/(config)vf-module-input-parameters"
             }
           }
         },
-        "operationId": "GET-vf-module-level-oper-status"
+        "operationId": "GET-vf-module-input-parameters"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)param",
+            "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-request-input/vf-module-input-parameters(config)param-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vf-module-input-parametersPOST"
+            }
+          }
+        },
+        "operationId": "POST-vf-module-input-parameters"
       },
       "put": {
         "consumes": [
@@ -48512,10 +52461,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vf-module-level-oper-status",
+            "name": "(config)vf-module-input-parameters",
             "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-level-oper-status-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input(config)vf-module-input-parameters-TOP"
             }
           }
         ],
@@ -48523,14 +52472,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-level-oper-status-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input(config)vf-module-input-parameters-TOP"
             }
           }
         },
-        "operationId": "PUT-vf-module-level-oper-status"
+        "operationId": "PUT-vf-module-input-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-request-input": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -48555,6 +52504,12 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -48562,7 +52517,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vf-module-request-input"
+        "operationId": "DELETE-param"
       },
       "get": {
         "produces": [
@@ -48588,53 +52543,119 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)vf-module-request-input"
-            }
-          }
-        },
-        "operationId": "GET-vf-module-request-input"
-      },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
           },
           {
             "in": "path",
-            "name": "vf-module-id",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)param"
+            }
+          }
+        },
+        "operationId": "GET-param"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)resource-resolution-data",
+            "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-request-input/vf-module-input-parameters/param(config)resource-resolution-data-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)paramPOST"
+            }
+          }
+        },
+        "operationId": "POST-param"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "**(config)vf-module-input-parameters",
+            "name": "(config)param",
             "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-request-input(config)vf-module-input-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param-TOP"
             }
           }
         ],
@@ -48642,17 +52663,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-request-inputPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param-TOP"
             }
           }
         },
-        "operationId": "POST-vf-module-request-input"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-param"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/{name}/resource-resolution-data": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -48678,48 +52697,8 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "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)vf-module-request-input-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "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"
-            }
-          }
-        },
-        "operationId": "PUT-vf-module-request-input"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-request-input/vf-module-input-parameters": {
-      "delete": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
             "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
+            "name": "name",
             "required": true,
             "type": "string"
           }
@@ -48729,7 +52708,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vf-module-input-parameters"
+        "operationId": "DELETE-resource-resolution-data"
       },
       "get": {
         "produces": [
@@ -48755,17 +52734,23 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-input-parameters"
+              "$ref": "#/definitions/(config)resource-resolution-data"
             }
           }
         },
-        "operationId": "GET-vf-module-input-parameters"
+        "operationId": "GET-resource-resolution-data"
       },
       "post": {
         "consumes": [
@@ -48796,12 +52781,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)param",
+            "name": "**(config)resource-key",
             "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-request-input/vf-module-input-parameters(config)param-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         ],
@@ -48809,11 +52800,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-input-parametersPOST"
+              "$ref": "#/definitions/(config)resource-resolution-dataPOST"
             }
           }
         },
-        "operationId": "POST-vf-module-input-parameters"
+        "operationId": "POST-resource-resolution-data"
       },
       "put": {
         "consumes": [
@@ -48844,12 +52835,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vf-module-input-parameters",
+            "name": "(config)resource-resolution-data",
             "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-request-input(config)vf-module-input-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data-TOP"
             }
           }
         ],
@@ -48857,14 +52854,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input(config)vf-module-input-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data-TOP"
             }
           }
         },
-        "operationId": "PUT-vf-module-input-parameters"
+        "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -48890,6 +52887,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -48902,7 +52905,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-param"
+        "operationId": "DELETE-resource-key"
       },
       "get": {
         "produces": [
@@ -48929,6 +52932,12 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "path",
             "name": "name",
@@ -48940,13 +52949,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)param"
+              "$ref": "#/definitions/(config)resource-key"
             }
           }
         },
-        "operationId": "GET-param"
+        "operationId": "GET-resource-key"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -48981,12 +52990,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)resource-resolution-data",
+            "name": "(config)resource-key",
             "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-request-input/vf-module-input-parameters/param(config)resource-resolution-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         ],
@@ -48994,17 +53009,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)paramPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         },
-        "operationId": "POST-param"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-resource-key"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -49028,35 +53041,16 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)param",
-            "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-request-input/vf-module-input-parameters(config)param-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-param"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/{name}/resource-resolution-data": {
-      "delete": {
+        "operationId": "DELETE-vf-module-topology"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -49080,22 +53074,23 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vf-module-topology"
+            }
           }
         },
-        "operationId": "DELETE-resource-resolution-data"
+        "operationId": "GET-vf-module-topology"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -49121,23 +53116,49 @@
             "type": "string"
           },
           {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)vf-module-parameters",
+            "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-parameters-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "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)onap-model-information-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "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)vf-module-topology-identifier-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)vf-module-assignments",
+            "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-assignments-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)resource-resolution-data"
+              "$ref": "#/definitions/(config)vf-module-topologyPOST"
             }
           }
         },
-        "operationId": "GET-resource-resolution-data"
+        "operationId": "POST-vf-module-topology"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -49166,18 +53187,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "**(config)resource-key",
+            "name": "(config)vf-module-topology",
             "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-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-topology-TOP"
             }
           }
         ],
@@ -49185,17 +53200,48 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)resource-resolution-dataPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-topology-TOP"
             }
           }
         },
-        "operationId": "POST-resource-resolution-data"
-      },
-      "put": {
-        "consumes": [
+        "operationId": "PUT-vf-module-topology"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/onap-model-information": {
+      "delete": {
+        "produces": [
           "application/json",
           "application/xml"
         ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-onap-model-information"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -49219,19 +53265,53 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)onap-model-information"
+            }
+          }
+        },
+        "operationId": "GET-onap-model-information"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
           },
           {
             "in": "path",
-            "name": "name",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)resource-resolution-data",
+            "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-request-input/vf-module-input-parameters/param(config)resource-resolution-data-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"
             }
           }
         ],
@@ -49239,14 +53319,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data-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"
             }
           }
         },
-        "operationId": "PUT-resource-resolution-data"
+        "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -49271,28 +53351,56 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vf-module-assignments"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
           },
           {
             "in": "path",
-            "name": "name",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "name",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vf-module-assignments"
+            }
           }
         },
-        "operationId": "DELETE-resource-key"
+        "operationId": "GET-vf-module-assignments"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -49318,27 +53426,39 @@
             "type": "string"
           },
           {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)vms",
+            "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/vf-module-assignments(config)vms-TOP"
+            }
           },
           {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)dhcp-subnet-assignments",
+            "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/vf-module-assignments(config)dhcp-subnet-assignments-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)vlan-vnfc-instance-groups",
+            "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/vf-module-assignments(config)vlan-vnfc-instance-groups-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)resource-key"
+              "$ref": "#/definitions/(config)vf-module-assignmentsPOST"
             }
           }
         },
-        "operationId": "GET-resource-key"
+        "operationId": "POST-vf-module-assignments"
       },
       "put": {
         "consumes": [
@@ -49369,24 +53489,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)resource-key",
+            "name": "(config)vf-module-assignments",
             "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-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key-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-assignments-TOP"
             }
           }
         ],
@@ -49394,14 +53502,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key-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-assignments-TOP"
             }
           }
         },
-        "operationId": "PUT-resource-key"
+        "operationId": "PUT-vf-module-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -49433,7 +53541,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vf-module-topology"
+        "operationId": "DELETE-dhcp-subnet-assignments"
       },
       "get": {
         "produces": [
@@ -49465,11 +53573,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-topology"
+              "$ref": "#/definitions/(config)dhcp-subnet-assignments"
             }
           }
         },
-        "operationId": "GET-vf-module-topology"
+        "operationId": "GET-dhcp-subnet-assignments"
       },
       "post": {
         "consumes": [
@@ -49502,34 +53610,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vf-module-parameters",
-            "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-parameters-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "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)onap-model-information-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)vf-module-topology-identifier",
+            "name": "**(config)dhcp-subnet-assignment",
             "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"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)vf-module-assignments",
-            "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-assignments-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP"
             }
           }
         ],
@@ -49537,11 +53621,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-topologyPOST"
+              "$ref": "#/definitions/(config)dhcp-subnet-assignmentsPOST"
             }
           }
         },
-        "operationId": "POST-vf-module-topology"
+        "operationId": "POST-dhcp-subnet-assignments"
       },
       "put": {
         "consumes": [
@@ -49574,10 +53658,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vf-module-topology",
+            "name": "(config)dhcp-subnet-assignments",
             "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-topology-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments-TOP"
             }
           }
         ],
@@ -49585,14 +53669,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-topology-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments-TOP"
             }
           }
         },
-        "operationId": "PUT-vf-module-topology"
+        "operationId": "PUT-dhcp-subnet-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments/dhcp-subnet-assignment/{neutron-subnet-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -49617,6 +53701,13 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Same as subnet-id in subnet-data structure",
+            "in": "path",
+            "name": "neutron-subnet-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -49624,7 +53715,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-onap-model-information"
+        "operationId": "DELETE-dhcp-subnet-assignment"
       },
       "get": {
         "produces": [
@@ -49650,17 +53741,24 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Same as subnet-id in subnet-data structure",
+            "in": "path",
+            "name": "neutron-subnet-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)onap-model-information"
+              "$ref": "#/definitions/(config)dhcp-subnet-assignment"
             }
           }
         },
-        "operationId": "GET-onap-model-information"
+        "operationId": "GET-dhcp-subnet-assignment"
       },
       "put": {
         "consumes": [
@@ -49691,12 +53789,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Same as subnet-id in subnet-data structure",
+            "in": "path",
+            "name": "neutron-subnet-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)onap-model-information",
+            "name": "(config)dhcp-subnet-assignment",
             "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/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP"
             }
           }
         ],
@@ -49704,14 +53809,14 @@
           "200": {
             "description": "No response was specified",
             "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/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP"
             }
           }
         },
-        "operationId": "PUT-onap-model-information"
+        "operationId": "PUT-dhcp-subnet-assignment"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups": {
       "delete": {
         "produces": [
           "application/json",
@@ -49743,7 +53848,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vf-module-assignments"
+        "operationId": "DELETE-vlan-vnfc-instance-groups"
       },
       "get": {
         "produces": [
@@ -49775,11 +53880,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-assignments"
+              "$ref": "#/definitions/(config)vlan-vnfc-instance-groups"
             }
           }
         },
-        "operationId": "GET-vf-module-assignments"
+        "operationId": "GET-vlan-vnfc-instance-groups"
       },
       "post": {
         "consumes": [
@@ -49812,18 +53917,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vms",
-            "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/vf-module-assignments(config)vms-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)vlan-vnfc-instance-groups",
+            "name": "**(config)vlan-vnfc-instance-group",
             "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/vf-module-assignments(config)vlan-vnfc-instance-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
             }
           }
         ],
@@ -49831,11 +53928,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-assignmentsPOST"
+              "$ref": "#/definitions/(config)vlan-vnfc-instance-groupsPOST"
             }
           }
         },
-        "operationId": "POST-vf-module-assignments"
+        "operationId": "POST-vlan-vnfc-instance-groups"
       },
       "put": {
         "consumes": [
@@ -49868,10 +53965,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vf-module-assignments",
+            "name": "(config)vlan-vnfc-instance-groups",
             "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-assignments-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)vlan-vnfc-instance-groups-TOP"
             }
           }
         ],
@@ -49879,14 +53976,14 @@
           "200": {
             "description": "No response was specified",
             "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-assignments-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)vlan-vnfc-instance-groups-TOP"
             }
           }
         },
-        "operationId": "PUT-vf-module-assignments"
+        "operationId": "PUT-vlan-vnfc-instance-groups"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -49911,6 +54008,13 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "A&AI ID",
+            "in": "path",
+            "name": "instance-group-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -49918,7 +54022,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vlan-vnfc-instance-groups"
+        "operationId": "DELETE-vlan-vnfc-instance-group"
       },
       "get": {
         "produces": [
@@ -49944,17 +54048,24 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "A&AI ID",
+            "in": "path",
+            "name": "instance-group-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnfc-instance-groups"
+              "$ref": "#/definitions/(config)vlan-vnfc-instance-group"
             }
           }
         },
-        "operationId": "GET-vlan-vnfc-instance-groups"
+        "operationId": "GET-vlan-vnfc-instance-group"
       },
       "post": {
         "consumes": [
@@ -49985,12 +54096,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "A&AI ID",
+            "in": "path",
+            "name": "instance-group-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vlan-vnfc-instance-group",
+            "name": "**(config)vnfcs",
             "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/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
             }
           }
         ],
@@ -49998,11 +54116,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnfc-instance-groupsPOST"
+              "$ref": "#/definitions/(config)vlan-vnfc-instance-groupPOST"
             }
           }
         },
-        "operationId": "POST-vlan-vnfc-instance-groups"
+        "operationId": "POST-vlan-vnfc-instance-group"
       },
       "put": {
         "consumes": [
@@ -50033,12 +54151,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "A&AI ID",
+            "in": "path",
+            "name": "instance-group-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vlan-vnfc-instance-groups",
+            "name": "(config)vlan-vnfc-instance-group",
             "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/vf-module-assignments(config)vlan-vnfc-instance-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
             }
           }
         ],
@@ -50046,14 +54171,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)vlan-vnfc-instance-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
             }
           }
         },
-        "operationId": "PUT-vlan-vnfc-instance-groups"
+        "operationId": "PUT-vlan-vnfc-instance-group"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs": {
       "delete": {
         "produces": [
           "application/json",
@@ -50092,7 +54217,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vlan-vnfc-instance-group"
+        "operationId": "DELETE-vnfcs"
       },
       "get": {
         "produces": [
@@ -50131,11 +54256,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnfc-instance-group"
+              "$ref": "#/definitions/(config)vnfcs"
             }
           }
         },
-        "operationId": "GET-vlan-vnfc-instance-group"
+        "operationId": "GET-vnfcs"
       },
       "post": {
         "consumes": [
@@ -50175,10 +54300,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vnfcs",
+            "name": "**(config)vnfc",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
             }
           }
         ],
@@ -50186,11 +54311,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnfc-instance-groupPOST"
+              "$ref": "#/definitions/(config)vnfcsPOST"
             }
           }
         },
-        "operationId": "POST-vlan-vnfc-instance-group"
+        "operationId": "POST-vnfcs"
       },
       "put": {
         "consumes": [
@@ -50230,10 +54355,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vlan-vnfc-instance-group",
+            "name": "(config)vnfcs",
             "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/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
             }
           }
         ],
@@ -50241,14 +54366,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
             }
           }
         },
-        "operationId": "PUT-vlan-vnfc-instance-group"
+        "operationId": "PUT-vnfcs"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -50280,6 +54405,12 @@
             "name": "instance-group-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -50287,7 +54418,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfcs"
+        "operationId": "DELETE-vnfc"
       },
       "get": {
         "produces": [
@@ -50320,17 +54451,23 @@
             "name": "instance-group-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfcs"
+              "$ref": "#/definitions/(config)vnfc"
             }
           }
         },
-        "operationId": "GET-vnfcs"
+        "operationId": "GET-vnfc"
       },
       "post": {
         "consumes": [
@@ -50368,12 +54505,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vnfc",
+            "name": "**(config)vnic-groups",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
             }
           }
         ],
@@ -50381,11 +54524,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfcsPOST"
+              "$ref": "#/definitions/(config)vnfcPOST"
             }
           }
         },
-        "operationId": "POST-vnfcs"
+        "operationId": "POST-vnfc"
       },
       "put": {
         "consumes": [
@@ -50423,12 +54566,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnfcs",
+            "name": "(config)vnfc",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
             }
           }
         ],
@@ -50436,14 +54585,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group(config)vnfcs-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
             }
           }
         },
-        "operationId": "PUT-vnfcs"
+        "operationId": "PUT-vnfc"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups": {
       "delete": {
         "produces": [
           "application/json",
@@ -50488,7 +54637,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc"
+        "operationId": "DELETE-vnic-groups"
       },
       "get": {
         "produces": [
@@ -50533,11 +54682,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc"
+              "$ref": "#/definitions/(config)vnic-groups"
             }
           }
         },
-        "operationId": "GET-vnfc"
+        "operationId": "GET-vnic-groups"
       },
       "post": {
         "consumes": [
@@ -50583,10 +54732,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vnic-groups",
+            "name": "**(config)vnic-group",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
             }
           }
         ],
@@ -50594,11 +54743,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfcPOST"
+              "$ref": "#/definitions/(config)vnic-groupsPOST"
             }
           }
         },
-        "operationId": "POST-vnfc"
+        "operationId": "POST-vnic-groups"
       },
       "put": {
         "consumes": [
@@ -50644,10 +54793,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vnfc",
+            "name": "(config)vnic-groups",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
             }
           }
         ],
@@ -50655,14 +54804,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs(config)vnfc-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
             }
           }
         },
-        "operationId": "PUT-vnfc"
+        "operationId": "PUT-vnic-groups"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}": {
       "delete": {
         "produces": [
           "application/json",
@@ -50700,6 +54849,13 @@
             "name": "vnfc-name",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Same as network-role of network where vnic is connected",
+            "in": "path",
+            "name": "vnic-interface-role",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -50707,7 +54863,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnic-groups"
+        "operationId": "DELETE-vnic-group"
       },
       "get": {
         "produces": [
@@ -50746,17 +54902,24 @@
             "name": "vnfc-name",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Same as network-role of network where vnic is connected",
+            "in": "path",
+            "name": "vnic-interface-role",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-groups"
+              "$ref": "#/definitions/(config)vnic-group"
             }
           }
         },
-        "operationId": "GET-vnic-groups"
+        "operationId": "GET-vnic-group"
       },
       "post": {
         "consumes": [
@@ -50800,12 +54963,27 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Same as network-role of network where vnic is connected",
+            "in": "path",
+            "name": "vnic-interface-role",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vnic-group",
+            "name": "**(config)vlan-common-ip-addresses",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)vlan-vnics",
+            "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
             }
           }
         ],
@@ -50813,11 +54991,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-groupsPOST"
+              "$ref": "#/definitions/(config)vnic-groupPOST"
             }
           }
         },
-        "operationId": "POST-vnic-groups"
+        "operationId": "POST-vnic-group"
       },
       "put": {
         "consumes": [
@@ -50861,12 +55039,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Same as network-role of network where vnic is connected",
+            "in": "path",
+            "name": "vnic-interface-role",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnic-groups",
+            "name": "(config)vnic-group",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
             }
           }
         ],
@@ -50874,14 +55059,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc(config)vnic-groups-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
             }
           }
         },
-        "operationId": "PUT-vnic-groups"
+        "operationId": "PUT-vnic-group"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-common-ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -50933,7 +55118,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnic-group"
+        "operationId": "DELETE-vlan-common-ip-addresses"
       },
       "get": {
         "produces": [
@@ -50985,11 +55170,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-group"
+              "$ref": "#/definitions/(config)vlan-common-ip-addresses"
             }
           }
         },
-        "operationId": "GET-vnic-group"
+        "operationId": "GET-vlan-common-ip-addresses"
       },
       "post": {
         "consumes": [
@@ -51042,18 +55227,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vlan-common-ip-addresses",
-            "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)vlan-vnics",
+            "name": "**(config)ip-addresses",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-common-ip-addresses(config)ip-addresses-TOP"
             }
           }
         ],
@@ -51061,11 +55238,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-groupPOST"
+              "$ref": "#/definitions/(config)vlan-common-ip-addressesPOST"
             }
           }
         },
-        "operationId": "POST-vnic-group"
+        "operationId": "POST-vlan-common-ip-addresses"
       },
       "put": {
         "consumes": [
@@ -51118,10 +55295,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vnic-group",
+            "name": "(config)vlan-common-ip-addresses",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
             }
           }
         ],
@@ -51129,14 +55306,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups(config)vnic-group-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
             }
           }
         },
-        "operationId": "PUT-vnic-group"
+        "operationId": "PUT-vlan-common-ip-addresses"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-common-ip-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-common-ip-addresses/ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -51188,7 +55365,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vlan-common-ip-addresses"
+        "operationId": "DELETE-ip-addresses"
       },
       "get": {
         "produces": [
@@ -51240,13 +55417,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-common-ip-addresses"
+              "$ref": "#/definitions/(config)ip-addresses"
             }
           }
         },
-        "operationId": "GET-vlan-common-ip-addresses"
+        "operationId": "GET-ip-addresses"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -51297,7 +55474,7 @@
           },
           {
             "in": "body",
-            "name": "**(config)ip-addresses",
+            "name": "(config)ip-addresses",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-common-ip-addresses(config)ip-addresses-TOP"
@@ -51308,17 +55485,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-common-ip-addressesPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-common-ip-addresses(config)ip-addresses-TOP"
             }
           }
         },
-        "operationId": "POST-vlan-common-ip-addresses"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-ip-addresses"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -51362,29 +55537,16 @@
             "name": "vnic-interface-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)vlan-common-ip-addresses",
-            "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-common-ip-addresses-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-vlan-common-ip-addresses"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-common-ip-addresses/ip-addresses": {
-      "delete": {
+        "operationId": "DELETE-vlan-vnics"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -51432,12 +55594,19 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vlan-vnics"
+            }
           }
         },
-        "operationId": "DELETE-ip-addresses"
+        "operationId": "GET-vlan-vnics"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -51481,17 +55650,25 @@
             "name": "vnic-interface-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vlan-vnic",
+            "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)ip-addresses"
+              "$ref": "#/definitions/(config)vlan-vnicsPOST"
             }
           }
         },
-        "operationId": "GET-ip-addresses"
+        "operationId": "POST-vlan-vnics"
       },
       "put": {
         "consumes": [
@@ -51544,10 +55721,10 @@
           },
           {
             "in": "body",
-            "name": "(config)ip-addresses",
+            "name": "(config)vlan-vnics",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-common-ip-addresses(config)ip-addresses-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
             }
           }
         ],
@@ -51555,14 +55732,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-common-ip-addresses(config)ip-addresses-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
             }
           }
         },
-        "operationId": "PUT-ip-addresses"
+        "operationId": "PUT-vlan-vnics"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -51607,6 +55784,12 @@
             "name": "vnic-interface-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnic-port-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -51614,7 +55797,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vlan-vnics"
+        "operationId": "DELETE-vlan-vnic"
       },
       "get": {
         "produces": [
@@ -51660,17 +55843,23 @@
             "name": "vnic-interface-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnic-port-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnics"
+              "$ref": "#/definitions/(config)vlan-vnic"
             }
           }
         },
-        "operationId": "GET-vlan-vnics"
+        "operationId": "GET-vlan-vnic"
       },
       "post": {
         "consumes": [
@@ -51721,12 +55910,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vnic-port-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vlan-vnic",
+            "name": "**(config)vnic-sub-interfaces",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
             }
           }
         ],
@@ -51734,11 +55929,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnicsPOST"
+              "$ref": "#/definitions/(config)vlan-vnicPOST"
             }
           }
         },
-        "operationId": "POST-vlan-vnics"
+        "operationId": "POST-vlan-vnic"
       },
       "put": {
         "consumes": [
@@ -51789,12 +55984,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vnic-port-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vlan-vnics",
+            "name": "(config)vlan-vnic",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
             }
           }
         ],
@@ -51802,14 +56003,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group(config)vlan-vnics-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
             }
           }
         },
-        "operationId": "PUT-vlan-vnics"
+        "operationId": "PUT-vlan-vnic"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces": {
       "delete": {
         "produces": [
           "application/json",
@@ -51867,7 +56068,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vlan-vnic"
+        "operationId": "DELETE-vnic-sub-interfaces"
       },
       "get": {
         "produces": [
@@ -51925,11 +56126,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnic"
+              "$ref": "#/definitions/(config)vnic-sub-interfaces"
             }
           }
         },
-        "operationId": "GET-vlan-vnic"
+        "operationId": "GET-vnic-sub-interfaces"
       },
       "post": {
         "consumes": [
@@ -51988,10 +56189,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vnic-sub-interfaces",
+            "name": "**(config)sub-interface-network-data",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
             }
           }
         ],
@@ -51999,11 +56200,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-vnicPOST"
+              "$ref": "#/definitions/(config)vnic-sub-interfacesPOST"
             }
           }
         },
-        "operationId": "POST-vlan-vnic"
+        "operationId": "POST-vnic-sub-interfaces"
       },
       "put": {
         "consumes": [
@@ -52062,10 +56263,10 @@
           },
           {
             "in": "body",
-            "name": "(config)vlan-vnic",
+            "name": "(config)vnic-sub-interfaces",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
             }
           }
         ],
@@ -52073,14 +56274,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics(config)vlan-vnic-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
             }
           }
         },
-        "operationId": "PUT-vlan-vnic"
+        "operationId": "PUT-vnic-sub-interfaces"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -52131,6 +56332,13 @@
             "name": "vnic-port-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -52138,7 +56346,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnic-sub-interfaces"
+        "operationId": "DELETE-sub-interface-network-data"
       },
       "get": {
         "produces": [
@@ -52190,17 +56398,24 @@
             "name": "vnic-port-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-sub-interfaces"
+              "$ref": "#/definitions/(config)sub-interface-network-data"
             }
           }
         },
-        "operationId": "GET-vnic-sub-interfaces"
+        "operationId": "GET-sub-interface-network-data"
       },
       "post": {
         "consumes": [
@@ -52257,12 +56472,27 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)sub-interface-network-data",
+            "name": "**(config)network-information-items",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)floating-ips",
+            "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
             }
           }
         ],
@@ -52270,11 +56500,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-sub-interfacesPOST"
+              "$ref": "#/definitions/(config)sub-interface-network-dataPOST"
             }
           }
         },
-        "operationId": "POST-vnic-sub-interfaces"
+        "operationId": "POST-sub-interface-network-data"
       },
       "put": {
         "consumes": [
@@ -52331,12 +56561,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnic-sub-interfaces",
+            "name": "(config)sub-interface-network-data",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
             }
           }
         ],
@@ -52344,14 +56581,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic(config)vnic-sub-interfaces-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
             }
           }
         },
-        "operationId": "PUT-vnic-sub-interfaces"
+        "operationId": "PUT-sub-interface-network-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/floating-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -52416,7 +56653,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-sub-interface-network-data"
+        "operationId": "DELETE-floating-ips"
       },
       "get": {
         "produces": [
@@ -52481,13 +56718,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sub-interface-network-data"
+              "$ref": "#/definitions/(config)floating-ips"
             }
           }
         },
-        "operationId": "GET-sub-interface-network-data"
+        "operationId": "GET-floating-ips"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -52551,15 +56788,7 @@
           },
           {
             "in": "body",
-            "name": "**(config)network-information-items",
-            "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)floating-ips",
+            "name": "(config)floating-ips",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
@@ -52570,17 +56799,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sub-interface-network-dataPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
             }
           }
         },
-        "operationId": "POST-sub-interface-network-data"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-floating-ips"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -52637,29 +56864,16 @@
             "name": "network-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)sub-interface-network-data",
-            "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-sub-interface-network-data"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/floating-ips": {
-      "delete": {
+        "operationId": "DELETE-network-information-items"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -52720,12 +56934,19 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)network-information-items"
+            }
           }
         },
-        "operationId": "DELETE-floating-ips"
+        "operationId": "GET-network-information-items"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -52782,17 +57003,25 @@
             "name": "network-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)network-information-item",
+            "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)floating-ips"
+              "$ref": "#/definitions/(config)network-information-itemsPOST"
             }
           }
         },
-        "operationId": "GET-floating-ips"
+        "operationId": "POST-network-information-items"
       },
       "put": {
         "consumes": [
@@ -52858,10 +57087,10 @@
           },
           {
             "in": "body",
-            "name": "(config)floating-ips",
+            "name": "(config)network-information-items",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
             }
           }
         ],
@@ -52869,14 +57098,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
             }
           }
         },
-        "operationId": "PUT-floating-ips"
+        "operationId": "PUT-network-information-items"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}": {
       "delete": {
         "produces": [
           "application/json",
@@ -52934,6 +57163,13 @@
             "name": "network-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -52941,7 +57177,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-network-information-items"
+        "operationId": "DELETE-network-information-item"
       },
       "get": {
         "produces": [
@@ -53000,17 +57236,24 @@
             "name": "network-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-items"
+              "$ref": "#/definitions/(config)network-information-item"
             }
           }
         },
-        "operationId": "GET-network-information-items"
+        "operationId": "GET-network-information-item"
       },
       "post": {
         "consumes": [
@@ -53074,12 +57317,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)network-information-item",
+            "name": "**(config)network-ips",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items/network-information-item(config)network-ips-TOP"
             }
           }
         ],
@@ -53087,11 +57337,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-itemsPOST"
+              "$ref": "#/definitions/(config)network-information-itemPOST"
             }
           }
         },
-        "operationId": "POST-network-information-items"
+        "operationId": "POST-network-information-item"
       },
       "put": {
         "consumes": [
@@ -53155,12 +57405,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)network-information-items",
+            "name": "(config)network-information-item",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
             }
           }
         ],
@@ -53168,14 +57425,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
             }
           }
         },
-        "operationId": "PUT-network-information-items"
+        "operationId": "PUT-network-information-item"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}/network-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -53247,7 +57504,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-network-information-item"
+        "operationId": "DELETE-network-ips"
       },
       "get": {
         "produces": [
@@ -53319,13 +57576,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-item"
+              "$ref": "#/definitions/(config)network-ips"
             }
           }
         },
-        "operationId": "GET-network-information-item"
+        "operationId": "GET-network-ips"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -53396,7 +57653,7 @@
           },
           {
             "in": "body",
-            "name": "**(config)network-ips",
+            "name": "(config)network-ips",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items/network-information-item(config)network-ips-TOP"
@@ -53407,17 +57664,48 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-itemPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items/network-information-item(config)network-ips-TOP"
             }
           }
         },
-        "operationId": "POST-network-information-item"
-      },
-      "put": {
-        "consumes": [
+        "operationId": "PUT-network-ips"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms": {
+      "delete": {
+        "produces": [
           "application/json",
           "application/xml"
         ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vms"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -53441,53 +57729,101 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vms"
+            }
+          }
+        },
+        "operationId": "GET-vms"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
           {
-            "description": "A&AI ID",
+            "description": "Keep as M",
             "in": "path",
-            "name": "instance-group-id",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "vnfc-name",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Same as network-role of network where vnic is connected",
             "in": "path",
-            "name": "vnic-interface-role",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           },
           {
+            "in": "body",
+            "name": "**(config)vm",
+            "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/vf-module-assignments/vms(config)vm-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vmsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vms"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
             "in": "path",
-            "name": "vnic-port-id",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Subinterface network id (UUID in A&AI)",
             "in": "path",
-            "name": "network-id",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Use ipv4 or ipv6",
             "in": "path",
-            "name": "ip-version",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)network-information-item",
+            "name": "(config)vms",
             "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)vms-TOP"
             }
           }
         ],
@@ -53495,14 +57831,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)vms-TOP"
             }
           }
         },
-        "operationId": "PUT-network-information-item"
+        "operationId": "PUT-vms"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/{instance-group-id}/vnfcs/vnfc/{vnfc-name}/vnic-groups/vnic-group/{vnic-interface-role}/vlan-vnics/vlan-vnic/{vnic-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}/network-ips": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}": {
       "delete": {
         "produces": [
           "application/json",
@@ -53529,54 +57865,136 @@
             "type": "string"
           },
           {
-            "description": "A&AI ID",
             "in": "path",
-            "name": "instance-group-id",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vm"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "vnfc-name",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Same as network-role of network where vnic is connected",
             "in": "path",
-            "name": "vnic-interface-role",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "vnic-port-id",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vm"
+            }
+          }
+        },
+        "operationId": "GET-vm"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Subinterface network id (UUID in A&AI)",
             "in": "path",
-            "name": "network-id",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Use ipv4 or ipv6",
             "in": "path",
-            "name": "ip-version",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vm-names",
+            "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/vf-module-assignments/vms/vm(config)vm-names-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)vm-networks",
+            "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/vf-module-assignments/vms/vm(config)vm-networks-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "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/vf-module-assignments/vms/vm(config)onap-model-information-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vmPOST"
+            }
           }
         },
-        "operationId": "DELETE-network-ips"
+        "operationId": "POST-vm"
       },
-      "get": {
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -53602,42 +58020,99 @@
             "type": "string"
           },
           {
-            "description": "A&AI ID",
             "in": "path",
-            "name": "instance-group-id",
+            "name": "vm-type",
             "required": true,
             "type": "string"
           },
           {
+            "in": "body",
+            "name": "(config)vm",
+            "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/vf-module-assignments/vms(config)vm-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms(config)vm-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vm"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/onap-model-information": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
             "in": "path",
-            "name": "vnfc-name",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Same as network-role of network where vnic is connected",
             "in": "path",
-            "name": "vnic-interface-role",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "vnic-port-id",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Subinterface network id (UUID in A&AI)",
             "in": "path",
-            "name": "network-id",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-onap-model-information"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Use ipv4 or ipv6",
             "in": "path",
-            "name": "ip-version",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
             "required": true,
             "type": "string"
           }
@@ -53646,11 +58121,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-ips"
+              "$ref": "#/definitions/(config)onap-model-information"
             }
           }
         },
-        "operationId": "GET-network-ips"
+        "operationId": "GET-onap-model-information"
       },
       "put": {
         "consumes": [
@@ -53682,51 +58157,17 @@
             "type": "string"
           },
           {
-            "description": "A&AI ID",
-            "in": "path",
-            "name": "instance-group-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnfc-name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Same as network-role of network where vnic is connected",
-            "in": "path",
-            "name": "vnic-interface-role",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnic-port-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Subinterface network id (UUID in A&AI)",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Use ipv4 or ipv6",
             "in": "path",
-            "name": "ip-version",
+            "name": "vm-type",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)network-ips",
+            "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/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items/network-information-item(config)network-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm(config)onap-model-information-TOP"
             }
           }
         ],
@@ -53734,14 +58175,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups/vlan-vnfc-instance-group/vnfcs/vnfc/vnic-groups/vnic-group/vlan-vnics/vlan-vnic/vnic-sub-interfaces/sub-interface-network-data/network-information-items/network-information-item(config)network-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm(config)onap-model-information-TOP"
             }
           }
         },
-        "operationId": "PUT-network-ips"
+        "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names": {
       "delete": {
         "produces": [
           "application/json",
@@ -53766,6 +58207,12 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -53773,7 +58220,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vms"
+        "operationId": "DELETE-vm-names"
       },
       "get": {
         "produces": [
@@ -53799,17 +58246,23 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vms"
+              "$ref": "#/definitions/(config)vm-names"
             }
           }
         },
-        "operationId": "GET-vms"
+        "operationId": "GET-vm-names"
       },
       "post": {
         "consumes": [
@@ -53840,12 +58293,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vm",
+            "name": "**(config)vnfc-names",
             "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/vf-module-assignments/vms(config)vm-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names(config)vnfc-names-TOP"
             }
           }
         ],
@@ -53853,11 +58312,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vmsPOST"
+              "$ref": "#/definitions/(config)vm-namesPOST"
             }
           }
         },
-        "operationId": "POST-vms"
+        "operationId": "POST-vm-names"
       },
       "put": {
         "consumes": [
@@ -53888,12 +58347,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vms",
+            "name": "(config)vm-names",
             "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/vf-module-assignments(config)vms-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm(config)vm-names-TOP"
             }
           }
         ],
@@ -53901,14 +58366,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)vms-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm(config)vm-names-TOP"
             }
           }
         },
-        "operationId": "PUT-vms"
+        "operationId": "PUT-vm-names"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -53939,6 +58404,12 @@
             "name": "vm-type",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -53946,7 +58417,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vm"
+        "operationId": "DELETE-vnfc-names"
       },
       "get": {
         "produces": [
@@ -53978,17 +58449,23 @@
             "name": "vm-type",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vm"
+              "$ref": "#/definitions/(config)vnfc-names"
             }
           }
         },
-        "operationId": "GET-vm"
+        "operationId": "GET-vnfc-names"
       },
       "post": {
         "consumes": [
@@ -54026,27 +58503,17 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)vm-names",
-            "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/vf-module-assignments/vms/vm(config)vm-names-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)vm-networks",
-            "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/vf-module-assignments/vms/vm(config)vm-networks-TOP"
-            }
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
           },
           {
             "in": "body",
-            "name": "**(config)onap-model-information",
+            "name": "**(config)vnfc-networks",
             "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/vf-module-assignments/vms/vm(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/vf-module-assignments/vms/vm/vm-names/vnfc-names(config)vnfc-networks-TOP"
             }
           }
         ],
@@ -54054,11 +58521,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vmPOST"
+              "$ref": "#/definitions/(config)vnfc-namesPOST"
             }
           }
         },
-        "operationId": "POST-vm"
+        "operationId": "POST-vnfc-names"
       },
       "put": {
         "consumes": [
@@ -54095,12 +58562,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vm",
+            "name": "(config)vnfc-names",
             "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/vf-module-assignments/vms(config)vm-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names(config)vnfc-names-TOP"
             }
           }
         ],
@@ -54108,14 +58581,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms(config)vm-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names(config)vnfc-names-TOP"
             }
           }
         },
-        "operationId": "PUT-vm"
+        "operationId": "PUT-vnfc-names"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -54146,62 +58619,22 @@
             "name": "vm-type",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-onap-model-information"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
           },
           {
             "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vm-type",
+            "name": "vnfc-name",
             "required": true,
             "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)onap-model-information"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-onap-model-information"
+        "operationId": "DELETE-vnfc-networks"
       },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -54233,27 +58666,27 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "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/vf-module-assignments/vms/vm(config)onap-model-information-TOP"
-            }
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm(config)onap-model-information-TOP"
+              "$ref": "#/definitions/(config)vnfc-networks"
             }
           }
         },
-        "operationId": "PUT-onap-model-information"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names": {
-      "delete": {
+        "operationId": "GET-vnfc-networks"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -54283,58 +58716,33 @@
             "name": "vm-type",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-vm-names"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
           },
           {
             "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
+            "name": "vnfc-name",
             "required": true,
             "type": "string"
           },
           {
-            "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)vnfc-network-data",
+            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks(config)vnfc-network-data-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vm-names"
+              "$ref": "#/definitions/(config)vnfc-networksPOST"
             }
           }
         },
-        "operationId": "GET-vm-names"
+        "operationId": "POST-vnfc-networks"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -54370,65 +58778,17 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)vnfc-names",
-            "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/vf-module-assignments/vms/vm/vm-names(config)vnfc-names-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)vm-namesPOST"
-            }
-          }
-        },
-        "operationId": "POST-vm-names"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
             "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vm-type",
+            "name": "vnfc-name",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)vm-names",
+            "name": "(config)vnfc-networks",
             "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/vf-module-assignments/vms/vm(config)vm-names-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names(config)vnfc-networks-TOP"
             }
           }
         ],
@@ -54436,14 +58796,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm(config)vm-names-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names(config)vnfc-networks-TOP"
             }
           }
         },
-        "operationId": "PUT-vm-names"
+        "operationId": "PUT-vnfc-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}": {
       "delete": {
         "produces": [
           "application/json",
@@ -54480,6 +58840,12 @@
             "name": "vnfc-name",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -54487,7 +58853,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc-names"
+        "operationId": "DELETE-vnfc-network-data"
       },
       "get": {
         "produces": [
@@ -54525,17 +58891,23 @@
             "name": "vnfc-name",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-names"
+              "$ref": "#/definitions/(config)vnfc-network-data"
             }
           }
         },
-        "operationId": "GET-vnfc-names"
+        "operationId": "GET-vnfc-network-data"
       },
       "post": {
         "consumes": [
@@ -54578,12 +58950,34 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vnfc-networks",
+            "name": "**(config)vnfc-ports",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names(config)vnfc-networks-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-ports-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnet",
+            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-subnet-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)connection-point",
+            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)connection-point-TOP"
             }
           }
         ],
@@ -54591,11 +58985,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-namesPOST"
+              "$ref": "#/definitions/(config)vnfc-network-dataPOST"
             }
           }
         },
-        "operationId": "POST-vnfc-names"
+        "operationId": "POST-vnfc-network-data"
       },
       "put": {
         "consumes": [
@@ -54638,12 +59032,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnfc-names",
+            "name": "(config)vnfc-network-data",
             "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/vf-module-assignments/vms/vm/vm-names(config)vnfc-names-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks(config)vnfc-network-data-TOP"
             }
           }
         ],
@@ -54651,14 +59051,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names(config)vnfc-names-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks(config)vnfc-network-data-TOP"
             }
           }
         },
-        "operationId": "PUT-vnfc-names"
+        "operationId": "PUT-vnfc-network-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/connection-point": {
       "delete": {
         "produces": [
           "application/json",
@@ -54695,6 +59095,12 @@
             "name": "vnfc-name",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -54702,7 +59108,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc-networks"
+        "operationId": "DELETE-connection-point"
       },
       "get": {
         "produces": [
@@ -54740,17 +59146,23 @@
             "name": "vnfc-name",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-networks"
+              "$ref": "#/definitions/(config)connection-point"
             }
           }
         },
-        "operationId": "GET-vnfc-networks"
+        "operationId": "GET-connection-point"
       },
       "post": {
         "consumes": [
@@ -54793,12 +59205,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vnfc-network-data",
+            "name": "**(config)vlan-data",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks(config)vnfc-network-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/connection-point(config)vlan-data-TOP"
             }
           }
         ],
@@ -54806,11 +59224,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-networksPOST"
+              "$ref": "#/definitions/(config)connection-pointPOST"
             }
           }
         },
-        "operationId": "POST-vnfc-networks"
+        "operationId": "POST-connection-point"
       },
       "put": {
         "consumes": [
@@ -54853,12 +59271,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnfc-networks",
+            "name": "(config)connection-point",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names(config)vnfc-networks-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)connection-point-TOP"
             }
           }
         ],
@@ -54866,14 +59290,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names(config)vnfc-networks-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)connection-point-TOP"
             }
           }
         },
-        "operationId": "PUT-vnfc-networks"
+        "operationId": "PUT-connection-point"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/connection-point/vlan-data/{vlan-uuid}": {
       "delete": {
         "produces": [
           "application/json",
@@ -54916,6 +59340,13 @@
             "name": "vnfc-network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Key to vlan-tag uuid object in A&AI Generated by vlan mS",
+            "in": "path",
+            "name": "vlan-uuid",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -54923,7 +59354,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc-network-data"
+        "operationId": "DELETE-vlan-data"
       },
       "get": {
         "produces": [
@@ -54967,19 +59398,26 @@
             "name": "vnfc-network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Key to vlan-tag uuid object in A&AI Generated by vlan mS",
+            "in": "path",
+            "name": "vlan-uuid",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-network-data"
+              "$ref": "#/definitions/(config)vlan-data"
             }
           }
         },
-        "operationId": "GET-vnfc-network-data"
+        "operationId": "GET-vlan-data"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -55027,27 +59465,18 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)vnfc-ports",
-            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-ports-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)vnfc-subnet",
-            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-subnet-TOP"
-            }
+            "description": "Key to vlan-tag uuid object in A&AI Generated by vlan mS",
+            "in": "path",
+            "name": "vlan-uuid",
+            "required": true,
+            "type": "string"
           },
           {
             "in": "body",
-            "name": "**(config)connection-point",
+            "name": "(config)vlan-data",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)connection-point-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/connection-point(config)vlan-data-TOP"
             }
           }
         ],
@@ -55055,17 +59484,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-network-dataPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/connection-point(config)vlan-data-TOP"
             }
           }
         },
-        "operationId": "POST-vnfc-network-data"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-vlan-data"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -55107,29 +59534,16 @@
             "name": "vnfc-network-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)vnfc-network-data",
-            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks(config)vnfc-network-data-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks(config)vnfc-network-data-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-vnfc-network-data"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/connection-point": {
-      "delete": {
+        "operationId": "DELETE-vnfc-ports"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -55175,12 +59589,19 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ports"
+            }
           }
         },
-        "operationId": "DELETE-connection-point"
+        "operationId": "GET-vnfc-ports"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -55222,19 +59643,27 @@
             "name": "vnfc-network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-port",
+            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports(config)vnfc-port-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)connection-point"
+              "$ref": "#/definitions/(config)vnfc-portsPOST"
             }
           }
         },
-        "operationId": "GET-connection-point"
+        "operationId": "POST-vnfc-ports"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -55283,10 +59712,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vlan-data",
+            "name": "(config)vnfc-ports",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/connection-point(config)vlan-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-ports-TOP"
             }
           }
         ],
@@ -55294,17 +59723,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)connection-pointPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-ports-TOP"
             }
           }
         },
-        "operationId": "POST-connection-point"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-vnfc-ports"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -55348,27 +59775,21 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "(config)connection-point",
-            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)connection-point-TOP"
-            }
+            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
+            "in": "path",
+            "name": "vnfc-port-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)connection-point-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-connection-point"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/connection-point/vlan-data/{vlan-uuid}": {
-      "delete": {
+        "operationId": "DELETE-vnfc-port"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -55412,21 +59833,28 @@
             "type": "string"
           },
           {
-            "description": "Key to vlan-tag uuid object in A&AI Generated by vlan mS",
+            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
             "in": "path",
-            "name": "vlan-uuid",
+            "name": "vnfc-port-id",
             "required": true,
             "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-port"
+            }
           }
         },
-        "operationId": "DELETE-vlan-data"
+        "operationId": "GET-vnfc-port"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -55470,22 +59898,30 @@
             "type": "string"
           },
           {
-            "description": "Key to vlan-tag uuid object in A&AI Generated by vlan mS",
+            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
             "in": "path",
-            "name": "vlan-uuid",
+            "name": "vnfc-port-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnic-sub-interfaces",
+            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port(config)vnic-sub-interfaces-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-data"
+              "$ref": "#/definitions/(config)vnfc-portPOST"
             }
           }
         },
-        "operationId": "GET-vlan-data"
+        "operationId": "POST-vnfc-port"
       },
       "put": {
         "consumes": [
@@ -55535,18 +59971,18 @@
             "type": "string"
           },
           {
-            "description": "Key to vlan-tag uuid object in A&AI Generated by vlan mS",
+            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
             "in": "path",
-            "name": "vlan-uuid",
+            "name": "vnfc-port-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)vlan-data",
+            "name": "(config)vnfc-port",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/connection-point(config)vlan-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports(config)vnfc-port-TOP"
             }
           }
         ],
@@ -55554,14 +59990,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/connection-point(config)vlan-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports(config)vnfc-port-TOP"
             }
           }
         },
-        "operationId": "PUT-vlan-data"
+        "operationId": "PUT-vnfc-port"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces": {
       "delete": {
         "produces": [
           "application/json",
@@ -55604,6 +60040,13 @@
             "name": "vnfc-network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
+            "in": "path",
+            "name": "vnfc-port-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -55611,7 +60054,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc-ports"
+        "operationId": "DELETE-vnic-sub-interfaces"
       },
       "get": {
         "produces": [
@@ -55655,17 +60098,24 @@
             "name": "vnfc-network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
+            "in": "path",
+            "name": "vnfc-port-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-ports"
+              "$ref": "#/definitions/(config)vnic-sub-interfaces"
             }
           }
         },
-        "operationId": "GET-vnfc-ports"
+        "operationId": "GET-vnic-sub-interfaces"
       },
       "post": {
         "consumes": [
@@ -55714,12 +60164,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
+            "in": "path",
+            "name": "vnfc-port-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vnfc-port",
+            "name": "**(config)sub-interface-network-data",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports(config)vnfc-port-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
             }
           }
         ],
@@ -55727,11 +60184,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-portsPOST"
+              "$ref": "#/definitions/(config)vnic-sub-interfacesPOST"
             }
           }
         },
-        "operationId": "POST-vnfc-ports"
+        "operationId": "POST-vnic-sub-interfaces"
       },
       "put": {
         "consumes": [
@@ -55780,12 +60237,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
+            "in": "path",
+            "name": "vnfc-port-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnfc-ports",
+            "name": "(config)vnic-sub-interfaces",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-ports-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port(config)vnic-sub-interfaces-TOP"
             }
           }
         ],
@@ -55793,14 +60257,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-ports-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port(config)vnic-sub-interfaces-TOP"
             }
           }
         },
-        "operationId": "PUT-vnfc-ports"
+        "operationId": "PUT-vnic-sub-interfaces"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -55850,6 +60314,13 @@
             "name": "vnfc-port-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -55857,7 +60328,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc-port"
+        "operationId": "DELETE-sub-interface-network-data"
       },
       "get": {
         "produces": [
@@ -55908,17 +60379,24 @@
             "name": "vnfc-port-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-port"
+              "$ref": "#/definitions/(config)sub-interface-network-data"
             }
           }
         },
-        "operationId": "GET-vnfc-port"
+        "operationId": "GET-sub-interface-network-data"
       },
       "post": {
         "consumes": [
@@ -55975,84 +60453,26 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)vnic-sub-interfaces",
-            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port(config)vnic-sub-interfaces-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)vnfc-portPOST"
-            }
-          }
-        },
-        "operationId": "POST-vnfc-port"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnfc-name",
-            "required": true,
-            "type": "string"
-          },
-          {
+            "description": "Subinterface network id (UUID in A&AI)",
             "in": "path",
-            "name": "vnfc-network-role",
+            "name": "network-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
-            "in": "path",
-            "name": "vnfc-port-id",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)network-information-items",
+            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
+            }
           },
           {
             "in": "body",
-            "name": "(config)vnfc-port",
+            "name": "**(config)floating-ips",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports(config)vnfc-port-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
             }
           }
         ],
@@ -56060,15 +60480,17 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports(config)vnfc-port-TOP"
+              "$ref": "#/definitions/(config)sub-interface-network-dataPOST"
             }
           }
         },
-        "operationId": "PUT-vnfc-port"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces": {
-      "delete": {
+        "operationId": "POST-sub-interface-network-data"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -56117,16 +60539,36 @@
             "name": "vnfc-port-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)sub-interface-network-data",
+            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
+            }
           }
         },
-        "operationId": "DELETE-vnic-sub-interfaces"
-      },
-      "get": {
+        "operationId": "PUT-sub-interface-network-data"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/floating-ips": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -56175,23 +60617,23 @@
             "name": "vnfc-port-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)vnic-sub-interfaces"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-vnic-sub-interfaces"
+        "operationId": "DELETE-floating-ips"
       },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -56242,23 +60684,22 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)sub-interface-network-data",
-            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
-            }
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnic-sub-interfacesPOST"
+              "$ref": "#/definitions/(config)floating-ips"
             }
           }
         },
-        "operationId": "POST-vnic-sub-interfaces"
+        "operationId": "GET-floating-ips"
       },
       "put": {
         "consumes": [
@@ -56314,12 +60755,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Subinterface network id (UUID in A&AI)",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnic-sub-interfaces",
+            "name": "(config)floating-ips",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port(config)vnic-sub-interfaces-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
             }
           }
         ],
@@ -56327,14 +60775,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port(config)vnic-sub-interfaces-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
             }
           }
         },
-        "operationId": "PUT-vnic-sub-interfaces"
+        "operationId": "PUT-floating-ips"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items": {
       "delete": {
         "produces": [
           "application/json",
@@ -56398,7 +60846,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-sub-interface-network-data"
+        "operationId": "DELETE-network-information-items"
       },
       "get": {
         "produces": [
@@ -56462,11 +60910,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sub-interface-network-data"
+              "$ref": "#/definitions/(config)network-information-items"
             }
           }
         },
-        "operationId": "GET-sub-interface-network-data"
+        "operationId": "GET-network-information-items"
       },
       "post": {
         "consumes": [
@@ -56531,18 +60979,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)network-information-items",
-            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)floating-ips",
+            "name": "**(config)network-information-item",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
             }
           }
         ],
@@ -56550,11 +60990,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sub-interface-network-dataPOST"
+              "$ref": "#/definitions/(config)network-information-itemsPOST"
             }
           }
         },
-        "operationId": "POST-sub-interface-network-data"
+        "operationId": "POST-network-information-items"
       },
       "put": {
         "consumes": [
@@ -56619,10 +61059,10 @@
           },
           {
             "in": "body",
-            "name": "(config)sub-interface-network-data",
+            "name": "(config)network-information-items",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
             }
           }
         ],
@@ -56630,14 +61070,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces(config)sub-interface-network-data-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
             }
           }
         },
-        "operationId": "PUT-sub-interface-network-data"
+        "operationId": "PUT-network-information-items"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/floating-ips": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}": {
       "delete": {
         "produces": [
           "application/json",
@@ -56694,166 +61134,23 @@
             "name": "network-id",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-floating-ips"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
           },
           {
+            "description": "Use ipv4 or ipv6",
             "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnfc-name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnfc-network-role",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
-            "in": "path",
-            "name": "vnfc-port-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Subinterface network id (UUID in A&AI)",
-            "in": "path",
-            "name": "network-id",
+            "name": "ip-version",
             "required": true,
             "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)floating-ips"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-floating-ips"
+        "operationId": "DELETE-network-information-item"
       },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnfc-name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnfc-network-role",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
-            "in": "path",
-            "name": "vnfc-port-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Subinterface network id (UUID in A&AI)",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)floating-ips",
-            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)floating-ips-TOP"
-            }
-          }
-        },
-        "operationId": "PUT-floating-ips"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items": {
-      "delete": {
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -56909,69 +61206,11 @@
             "name": "network-id",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-network-information-items"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
           },
           {
+            "description": "Use ipv4 or ipv6",
             "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnfc-name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnfc-network-role",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
-            "in": "path",
-            "name": "vnfc-port-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Subinterface network id (UUID in A&AI)",
-            "in": "path",
-            "name": "network-id",
+            "name": "ip-version",
             "required": true,
             "type": "string"
           }
@@ -56980,11 +61219,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-items"
+              "$ref": "#/definitions/(config)network-information-item"
             }
           }
         },
-        "operationId": "GET-network-information-items"
+        "operationId": "GET-network-information-item"
       },
       "post": {
         "consumes": [
@@ -57047,12 +61286,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)network-information-item",
+            "name": "**(config)network-ips",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items/network-information-item(config)network-ips-TOP"
             }
           }
         ],
@@ -57060,11 +61306,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-itemsPOST"
+              "$ref": "#/definitions/(config)network-information-itemPOST"
             }
           }
         },
-        "operationId": "POST-network-information-items"
+        "operationId": "POST-network-information-item"
       },
       "put": {
         "consumes": [
@@ -57127,12 +61373,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)network-information-items",
+            "name": "(config)network-information-item",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
             }
           }
         ],
@@ -57140,14 +61393,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data(config)network-information-items-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
             }
           }
         },
-        "operationId": "PUT-network-information-items"
+        "operationId": "PUT-network-information-item"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}/network-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -57218,7 +61471,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-network-information-item"
+        "operationId": "DELETE-network-ips"
       },
       "get": {
         "produces": [
@@ -57289,13 +61542,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-item"
+              "$ref": "#/definitions/(config)network-ips"
             }
           }
         },
-        "operationId": "GET-network-information-item"
+        "operationId": "GET-network-ips"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -57365,7 +61618,7 @@
           },
           {
             "in": "body",
-            "name": "**(config)network-ips",
+            "name": "(config)network-ips",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items/network-information-item(config)network-ips-TOP"
@@ -57376,17 +61629,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-itemPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items/network-information-item(config)network-ips-TOP"
             }
           }
         },
-        "operationId": "POST-network-information-item"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-network-ips"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -57430,48 +61681,21 @@
             "type": "string"
           },
           {
-            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
-            "in": "path",
-            "name": "vnfc-port-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Subinterface network id (UUID in A&AI)",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Use ipv4 or ipv6",
+            "description": "Default value if subnet role is not defined.",
             "in": "path",
-            "name": "ip-version",
+            "name": "vnfc-subnet-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)network-information-item",
-            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items(config)network-information-item-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-network-information-item"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-ports/vnfc-port/{vnfc-port-id}/vnic-sub-interfaces/sub-interface-network-data/{network-id}/network-information-items/network-information-item/{ip-version}/network-ips": {
-      "delete": {
+        "operationId": "DELETE-vnfc-subnet"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -57515,35 +61739,28 @@
             "type": "string"
           },
           {
-            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
-            "in": "path",
-            "name": "vnfc-port-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Subinterface network id (UUID in A&AI)",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Use ipv4 or ipv6",
+            "description": "Default value if subnet role is not defined.",
             "in": "path",
-            "name": "ip-version",
+            "name": "vnfc-subnet-role",
             "required": true,
             "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnet"
+            }
           }
         },
-        "operationId": "DELETE-network-ips"
+        "operationId": "GET-vnfc-subnet"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -57587,36 +61804,30 @@
             "type": "string"
           },
           {
-            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
-            "in": "path",
-            "name": "vnfc-port-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Subinterface network id (UUID in A&AI)",
+            "description": "Default value if subnet role is not defined.",
             "in": "path",
-            "name": "network-id",
+            "name": "vnfc-subnet-role",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Use ipv4 or ipv6",
-            "in": "path",
-            "name": "ip-version",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)vnfc-ip-assignments",
+            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet(config)vnfc-ip-assignments-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-ips"
+              "$ref": "#/definitions/(config)vnfc-subnetPOST"
             }
           }
         },
-        "operationId": "GET-network-ips"
+        "operationId": "POST-vnfc-subnet"
       },
       "put": {
         "consumes": [
@@ -57666,32 +61877,18 @@
             "type": "string"
           },
           {
-            "description": "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y",
-            "in": "path",
-            "name": "vnfc-port-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Subinterface network id (UUID in A&AI)",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "Use ipv4 or ipv6",
+            "description": "Default value if subnet role is not defined.",
             "in": "path",
-            "name": "ip-version",
+            "name": "vnfc-subnet-role",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)network-ips",
+            "name": "(config)vnfc-subnet",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items/network-information-item(config)network-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-subnet-TOP"
             }
           }
         ],
@@ -57699,14 +61896,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-ports/vnfc-port/vnic-sub-interfaces/sub-interface-network-data/network-information-items/network-information-item(config)network-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-subnet-TOP"
             }
           }
         },
-        "operationId": "PUT-network-ips"
+        "operationId": "PUT-vnfc-subnet"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}/vnfc-ip-assignments/{vnfc-address-family}": {
       "delete": {
         "produces": [
           "application/json",
@@ -57756,6 +61953,13 @@
             "name": "vnfc-subnet-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "indicates if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -57763,7 +61967,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc-subnet"
+        "operationId": "DELETE-vnfc-ip-assignments"
       },
       "get": {
         "produces": [
@@ -57814,17 +62018,24 @@
             "name": "vnfc-subnet-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "indicates if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-subnet"
+              "$ref": "#/definitions/(config)vnfc-ip-assignments"
             }
           }
         },
-        "operationId": "GET-vnfc-subnet"
+        "operationId": "GET-vnfc-ip-assignments"
       },
       "post": {
         "consumes": [
@@ -57880,12 +62091,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "indicates if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vnfc-ip-assignments",
+            "name": "**(config)vnfc-subnet-ip",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet(config)vnfc-ip-assignments-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet/vnfc-ip-assignments(config)vnfc-subnet-ip-TOP"
             }
           }
         ],
@@ -57893,11 +62111,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-subnetPOST"
+              "$ref": "#/definitions/(config)vnfc-ip-assignmentsPOST"
             }
           }
         },
-        "operationId": "POST-vnfc-subnet"
+        "operationId": "POST-vnfc-ip-assignments"
       },
       "put": {
         "consumes": [
@@ -57953,12 +62171,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "indicates if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnfc-subnet",
+            "name": "(config)vnfc-ip-assignments",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-subnet-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet(config)vnfc-ip-assignments-TOP"
             }
           }
         ],
@@ -57966,14 +62191,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data(config)vnfc-subnet-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet(config)vnfc-ip-assignments-TOP"
             }
           }
         },
-        "operationId": "PUT-vnfc-subnet"
+        "operationId": "PUT-vnfc-ip-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}/vnfc-ip-assignments/{vnfc-address-family}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}/vnfc-ip-assignments/{vnfc-address-family}/vnfc-subnet-ip/{vnfc-ip-address}": {
       "delete": {
         "produces": [
           "application/json",
@@ -58030,6 +62255,13 @@
             "name": "vnfc-address-family",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Either IpV4 IP or IpV6 IP addresses should be present",
+            "in": "path",
+            "name": "vnfc-ip-address",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -58037,7 +62269,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnfc-ip-assignments"
+        "operationId": "DELETE-vnfc-subnet-ip"
       },
       "get": {
         "produces": [
@@ -58095,19 +62327,26 @@
             "name": "vnfc-address-family",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Either IpV4 IP or IpV6 IP addresses should be present",
+            "in": "path",
+            "name": "vnfc-ip-address",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-ip-assignments"
+              "$ref": "#/definitions/(config)vnfc-subnet-ip"
             }
           }
         },
-        "operationId": "GET-vnfc-ip-assignments"
+        "operationId": "GET-vnfc-subnet-ip"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -58168,9 +62407,16 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Either IpV4 IP or IpV6 IP addresses should be present",
+            "in": "path",
+            "name": "vnfc-ip-address",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vnfc-subnet-ip",
+            "name": "(config)vnfc-subnet-ip",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet/vnfc-ip-assignments(config)vnfc-subnet-ip-TOP"
@@ -58181,17 +62427,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-ip-assignmentsPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet/vnfc-ip-assignments(config)vnfc-subnet-ip-TOP"
             }
           }
         },
-        "operationId": "POST-vnfc-ip-assignments"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-vnfc-subnet-ip"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -58221,55 +62465,62 @@
             "name": "vm-type",
             "required": true,
             "type": "string"
-          },
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vm-networks"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
           {
+            "description": "Keep as M",
             "in": "path",
-            "name": "vnfc-name",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "vnfc-network-role",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Default value if subnet role is not defined.",
             "in": "path",
-            "name": "vnfc-subnet-role",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "indicates if this is IpV4 or IpV6",
             "in": "path",
-            "name": "vnfc-address-family",
+            "name": "vm-type",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)vnfc-ip-assignments",
-            "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet(config)vnfc-ip-assignments-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet(config)vnfc-ip-assignments-TOP"
+              "$ref": "#/definitions/(config)vm-networks"
             }
           }
         },
-        "operationId": "PUT-vnfc-ip-assignments"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-names/vnfc-names/{vnfc-name}/vnfc-networks/vnfc-network-data/{vnfc-network-role}/vnfc-subnet/{vnfc-subnet-role}/vnfc-ip-assignments/{vnfc-address-family}/vnfc-subnet-ip/{vnfc-ip-address}": {
-      "delete": {
+        "operationId": "GET-vm-networks"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -58301,47 +62552,81 @@
             "type": "string"
           },
           {
+            "in": "body",
+            "name": "**(config)vm-network",
+            "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/vf-module-assignments/vms/vm/vm-networks(config)vm-network-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vm-networksPOST"
+            }
+          }
+        },
+        "operationId": "POST-vm-networks"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
             "in": "path",
-            "name": "vnfc-name",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "vnfc-network-role",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Default value if subnet role is not defined.",
             "in": "path",
-            "name": "vnfc-subnet-role",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "indicates if this is IpV4 or IpV6",
             "in": "path",
-            "name": "vnfc-address-family",
+            "name": "vm-type",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Either IpV4 IP or IpV6 IP addresses should be present",
-            "in": "path",
-            "name": "vnfc-ip-address",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "(config)vm-networks",
+            "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/vf-module-assignments/vms/vm(config)vm-networks-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm(config)vm-networks-TOP"
+            }
           }
         },
-        "operationId": "DELETE-vnfc-subnet-ip"
-      },
-      "get": {
+        "operationId": "PUT-vm-networks"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -58373,35 +62658,55 @@
             "type": "string"
           },
           {
+            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
             "in": "path",
-            "name": "vnfc-name",
+            "name": "network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vm-network"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "path",
-            "name": "vnfc-network-role",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Default value if subnet role is not defined.",
             "in": "path",
-            "name": "vnfc-subnet-role",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "indicates if this is IpV4 or IpV6",
             "in": "path",
-            "name": "vnfc-address-family",
+            "name": "vm-type",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Either IpV4 IP or IpV6 IP addresses should be present",
+            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
             "in": "path",
-            "name": "vnfc-ip-address",
+            "name": "network-role",
             "required": true,
             "type": "string"
           }
@@ -58410,13 +62715,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnfc-subnet-ip"
+              "$ref": "#/definitions/(config)vm-network"
             }
           }
         },
-        "operationId": "GET-vnfc-subnet-ip"
+        "operationId": "GET-vm-network"
       },
-      "put": {
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -58452,44 +62757,119 @@
             "type": "string"
           },
           {
+            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
             "in": "path",
-            "name": "vnfc-name",
+            "name": "network-role",
             "required": true,
             "type": "string"
           },
           {
+            "in": "body",
+            "name": "**(config)network-information-items",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)network-information-items-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)mac-addresses",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)mac-addresses-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)floating-ips",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)floating-ips-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)interface-route-prefixes",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)interface-route-prefixes-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)sriov-parameters",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)sriov-parameters-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)related-networks",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)related-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vm-networkPOST"
+            }
+          }
+        },
+        "operationId": "POST-vm-network"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
             "in": "path",
-            "name": "vnfc-network-role",
+            "name": "service-instance-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Default value if subnet role is not defined.",
             "in": "path",
-            "name": "vnfc-subnet-role",
+            "name": "vnf-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "indicates if this is IpV4 or IpV6",
             "in": "path",
-            "name": "vnfc-address-family",
+            "name": "vf-module-id",
             "required": true,
             "type": "string"
           },
           {
-            "description": "Either IpV4 IP or IpV6 IP addresses should be present",
             "in": "path",
-            "name": "vnfc-ip-address",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
+            "in": "path",
+            "name": "network-role",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)vnfc-subnet-ip",
+            "name": "(config)vm-network",
             "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/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet/vnfc-ip-assignments(config)vnfc-subnet-ip-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks(config)vm-network-TOP"
             }
           }
         ],
@@ -58497,14 +62877,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-names/vnfc-names/vnfc-networks/vnfc-network-data/vnfc-subnet/vnfc-ip-assignments(config)vnfc-subnet-ip-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks(config)vm-network-TOP"
             }
           }
         },
-        "operationId": "PUT-vnfc-subnet-ip"
+        "operationId": "PUT-vm-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/floating-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -58535,62 +62915,23 @@
             "name": "vm-type",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-vm-networks"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
           },
           {
+            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
             "in": "path",
-            "name": "vm-type",
+            "name": "network-role",
             "required": true,
             "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)vm-networks"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-vm-networks"
+        "operationId": "DELETE-floating-ips"
       },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -58622,23 +62963,22 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)vm-network",
-            "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/vf-module-assignments/vms/vm/vm-networks(config)vm-network-TOP"
-            }
+            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
+            "in": "path",
+            "name": "network-role",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vm-networksPOST"
+              "$ref": "#/definitions/(config)floating-ips"
             }
           }
         },
-        "operationId": "POST-vm-networks"
+        "operationId": "GET-floating-ips"
       },
       "put": {
         "consumes": [
@@ -58675,12 +63015,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
+            "in": "path",
+            "name": "network-role",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vm-networks",
+            "name": "(config)floating-ips",
             "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/vf-module-assignments/vms/vm(config)vm-networks-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)floating-ips-TOP"
             }
           }
         ],
@@ -58688,14 +63035,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm(config)vm-networks-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)floating-ips-TOP"
             }
           }
         },
-        "operationId": "PUT-vm-networks"
+        "operationId": "PUT-floating-ips"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/interface-route-prefixes": {
       "delete": {
         "produces": [
           "application/json",
@@ -58740,7 +63087,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vm-network"
+        "operationId": "DELETE-interface-route-prefixes"
       },
       "get": {
         "produces": [
@@ -58785,13 +63132,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vm-network"
+              "$ref": "#/definitions/(config)interface-route-prefixes"
             }
           }
         },
-        "operationId": "GET-vm-network"
+        "operationId": "GET-interface-route-prefixes"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -58835,68 +63182,26 @@
           },
           {
             "in": "body",
-            "name": "**(config)network-information-items",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)network-information-items-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)mac-addresses",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)mac-addresses-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)floating-ips",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)floating-ips-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)interface-route-prefixes",
+            "name": "(config)interface-route-prefixes",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)interface-route-prefixes-TOP"
             }
-          },
-          {
-            "in": "body",
-            "name": "**(config)sriov-parameters",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)sriov-parameters-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)related-networks",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)related-networks-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vm-networkPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)interface-route-prefixes-TOP"
             }
           }
         },
-        "operationId": "POST-vm-network"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-interface-route-prefixes"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/mac-addresses": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -58933,29 +63238,16 @@
             "name": "network-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)vm-network",
-            "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/vf-module-assignments/vms/vm/vm-networks(config)vm-network-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks(config)vm-network-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-vm-network"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/floating-ips": {
-      "delete": {
+        "operationId": "DELETE-mac-addresses"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -58996,12 +63288,19 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)mac-addresses"
+            }
           }
         },
-        "operationId": "DELETE-floating-ips"
+        "operationId": "GET-mac-addresses"
       },
-      "get": {
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -59038,23 +63337,29 @@
             "name": "network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)mac-addresses",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)mac-addresses-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)floating-ips"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)mac-addresses-TOP"
             }
           }
         },
-        "operationId": "GET-floating-ips"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-mac-addresses"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -59091,29 +63396,16 @@
             "name": "network-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)floating-ips",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)floating-ips-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)floating-ips-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-floating-ips"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/interface-route-prefixes": {
-      "delete": {
+        "operationId": "DELETE-network-information-items"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -59154,12 +63446,19 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)network-information-items"
+            }
           }
         },
-        "operationId": "DELETE-interface-route-prefixes"
+        "operationId": "GET-network-information-items"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -59196,17 +63495,25 @@
             "name": "network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)network-information-item",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items(config)network-information-item-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)interface-route-prefixes"
+              "$ref": "#/definitions/(config)network-information-itemsPOST"
             }
           }
         },
-        "operationId": "GET-interface-route-prefixes"
+        "operationId": "POST-network-information-items"
       },
       "put": {
         "consumes": [
@@ -59252,10 +63559,10 @@
           },
           {
             "in": "body",
-            "name": "(config)interface-route-prefixes",
+            "name": "(config)network-information-items",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)interface-route-prefixes-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)network-information-items-TOP"
             }
           }
         ],
@@ -59263,14 +63570,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)interface-route-prefixes-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)network-information-items-TOP"
             }
           }
         },
-        "operationId": "PUT-interface-route-prefixes"
+        "operationId": "PUT-network-information-items"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/mac-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items/network-information-item/{ip-version}": {
       "delete": {
         "produces": [
           "application/json",
@@ -59308,6 +63615,13 @@
             "name": "network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -59315,7 +63629,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-mac-addresses"
+        "operationId": "DELETE-network-information-item"
       },
       "get": {
         "produces": [
@@ -59354,19 +63668,26 @@
             "name": "network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)mac-addresses"
+              "$ref": "#/definitions/(config)network-information-item"
             }
           }
         },
-        "operationId": "GET-mac-addresses"
+        "operationId": "GET-network-information-item"
       },
-      "put": {
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -59408,12 +63729,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)mac-addresses",
+            "name": "**(config)network-ips",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)mac-addresses-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items/network-information-item(config)network-ips-TOP"
             }
           }
         ],
@@ -59421,15 +63749,17 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)mac-addresses-TOP"
+              "$ref": "#/definitions/(config)network-information-itemPOST"
             }
           }
         },
-        "operationId": "PUT-mac-addresses"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items": {
-      "delete": {
+        "operationId": "POST-network-information-item"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -59466,16 +63796,36 @@
             "name": "network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)network-information-item",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items(config)network-information-item-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items(config)network-information-item-TOP"
+            }
           }
         },
-        "operationId": "DELETE-network-information-items"
-      },
-      "get": {
+        "operationId": "PUT-network-information-item"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items/network-information-item/{ip-version}/network-ips": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -59512,23 +63862,23 @@
             "name": "network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)network-information-items"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-network-information-items"
+        "operationId": "DELETE-network-ips"
       },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -59567,23 +63917,22 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)network-information-item",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items(config)network-information-item-TOP"
-            }
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-itemsPOST"
+              "$ref": "#/definitions/(config)network-ips"
             }
           }
         },
-        "operationId": "POST-network-information-items"
+        "operationId": "GET-network-ips"
       },
       "put": {
         "consumes": [
@@ -59627,12 +63976,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Use ipv4 or ipv6",
+            "in": "path",
+            "name": "ip-version",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)network-information-items",
+            "name": "(config)network-ips",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)network-information-items-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items/network-information-item(config)network-ips-TOP"
             }
           }
         ],
@@ -59640,14 +63996,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)network-information-items-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items/network-information-item(config)network-ips-TOP"
             }
           }
         },
-        "operationId": "PUT-network-information-items"
+        "operationId": "PUT-network-ips"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items/network-information-item/{ip-version}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -59685,13 +64041,6 @@
             "name": "network-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "Use ipv4 or ipv6",
-            "in": "path",
-            "name": "ip-version",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -59699,7 +64048,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-network-information-item"
+        "operationId": "DELETE-related-networks"
       },
       "get": {
         "produces": [
@@ -59738,24 +64087,17 @@
             "name": "network-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "Use ipv4 or ipv6",
-            "in": "path",
-            "name": "ip-version",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-item"
+              "$ref": "#/definitions/(config)related-networks"
             }
           }
         },
-        "operationId": "GET-network-information-item"
+        "operationId": "GET-related-networks"
       },
       "post": {
         "consumes": [
@@ -59799,19 +64141,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "description": "Use ipv4 or ipv6",
-            "in": "path",
-            "name": "ip-version",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "**(config)network-ips",
+            "name": "**(config)related-network",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items/network-information-item(config)network-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks(config)related-network-TOP"
             }
           }
         ],
@@ -59819,11 +64154,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-information-itemPOST"
+              "$ref": "#/definitions/(config)related-networksPOST"
             }
           }
         },
-        "operationId": "POST-network-information-item"
+        "operationId": "POST-related-networks"
       },
       "put": {
         "consumes": [
@@ -59867,19 +64202,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "description": "Use ipv4 or ipv6",
-            "in": "path",
-            "name": "ip-version",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)network-information-item",
+            "name": "(config)related-networks",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items(config)network-information-item-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)related-networks-TOP"
             }
           }
         ],
@@ -59887,14 +64215,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items(config)network-information-item-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)related-networks-TOP"
             }
           }
         },
-        "operationId": "PUT-network-information-item"
+        "operationId": "PUT-related-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/network-information-items/network-information-item/{ip-version}/network-ips": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks/related-network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -59934,9 +64262,9 @@
             "type": "string"
           },
           {
-            "description": "Use ipv4 or ipv6",
+            "description": "Key to l3-network object",
             "in": "path",
-            "name": "ip-version",
+            "name": "network-id",
             "required": true,
             "type": "string"
           }
@@ -59946,7 +64274,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-network-ips"
+        "operationId": "DELETE-related-network"
       },
       "get": {
         "produces": [
@@ -59987,9 +64315,9 @@
             "type": "string"
           },
           {
-            "description": "Use ipv4 or ipv6",
+            "description": "Key to l3-network object",
             "in": "path",
-            "name": "ip-version",
+            "name": "network-id",
             "required": true,
             "type": "string"
           }
@@ -59998,13 +64326,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)network-ips"
+              "$ref": "#/definitions/(config)related-network"
             }
           }
         },
-        "operationId": "GET-network-ips"
+        "operationId": "GET-related-network"
       },
-      "put": {
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -60047,18 +64375,18 @@
             "type": "string"
           },
           {
-            "description": "Use ipv4 or ipv6",
+            "description": "Key to l3-network object",
             "in": "path",
-            "name": "ip-version",
+            "name": "network-id",
             "required": true,
             "type": "string"
           },
           {
             "in": "body",
-            "name": "(config)network-ips",
+            "name": "**(config)vlan-tags",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items/network-information-item(config)network-ips-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks/related-network(config)vlan-tags-TOP"
             }
           }
         ],
@@ -60066,15 +64394,17 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/network-information-items/network-information-item(config)network-ips-TOP"
+              "$ref": "#/definitions/(config)related-networkPOST"
             }
           }
         },
-        "operationId": "PUT-network-ips"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks": {
-      "delete": {
+        "operationId": "POST-related-network"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -60111,16 +64441,36 @@
             "name": "network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Key to l3-network object",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)related-network",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks(config)related-network-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks(config)related-network-TOP"
+            }
           }
         },
-        "operationId": "DELETE-related-networks"
-      },
-      "get": {
+        "operationId": "PUT-related-network"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks/related-network/{network-id}/vlan-tags": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -60157,23 +64507,23 @@
             "name": "network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Key to l3-network object",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)related-networks"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-related-networks"
+        "operationId": "DELETE-vlan-tags"
       },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -60212,23 +64562,22 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)related-network",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks(config)related-network-TOP"
-            }
+            "description": "Key to l3-network object",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)related-networksPOST"
+              "$ref": "#/definitions/(config)vlan-tags"
             }
           }
         },
-        "operationId": "POST-related-networks"
+        "operationId": "GET-vlan-tags"
       },
       "put": {
         "consumes": [
@@ -60272,12 +64621,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Key to l3-network object",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)related-networks",
+            "name": "(config)vlan-tags",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)related-networks-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks/related-network(config)vlan-tags-TOP"
             }
           }
         ],
@@ -60285,14 +64641,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)related-networks-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks/related-network(config)vlan-tags-TOP"
             }
           }
         },
-        "operationId": "PUT-related-networks"
+        "operationId": "PUT-vlan-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks/related-network/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -60330,13 +64686,6 @@
             "name": "network-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "Key to l3-network object",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -60344,7 +64693,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-related-network"
+        "operationId": "DELETE-sriov-parameters"
       },
       "get": {
         "produces": [
@@ -60383,24 +64732,17 @@
             "name": "network-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "Key to l3-network object",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)related-network"
+              "$ref": "#/definitions/(config)sriov-parameters"
             }
           }
         },
-        "operationId": "GET-related-network"
+        "operationId": "GET-sriov-parameters"
       },
       "post": {
         "consumes": [
@@ -60445,18 +64787,19 @@
             "type": "string"
           },
           {
-            "description": "Key to l3-network object",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)heat-vlan-filters",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)heat-vlan-filters-TOP"
+            }
           },
           {
             "in": "body",
-            "name": "**(config)vlan-tags",
+            "name": "**(config)application-tags",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks/related-network(config)vlan-tags-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)application-tags-TOP"
             }
           }
         ],
@@ -60464,11 +64807,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)related-networkPOST"
+              "$ref": "#/definitions/(config)sriov-parametersPOST"
             }
           }
         },
-        "operationId": "POST-related-network"
+        "operationId": "POST-sriov-parameters"
       },
       "put": {
         "consumes": [
@@ -60512,19 +64855,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "description": "Key to l3-network object",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)related-network",
+            "name": "(config)sriov-parameters",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks(config)related-network-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)sriov-parameters-TOP"
             }
           }
         ],
@@ -60532,14 +64868,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks(config)related-network-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)sriov-parameters-TOP"
             }
           }
         },
-        "operationId": "PUT-related-network"
+        "operationId": "PUT-sriov-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/related-networks/related-network/{network-id}/vlan-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -60577,13 +64913,6 @@
             "name": "network-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "description": "Key to l3-network object",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -60591,7 +64920,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vlan-tags"
+        "operationId": "DELETE-application-tags"
       },
       "get": {
         "produces": [
@@ -60630,24 +64959,86 @@
             "name": "network-role",
             "required": true,
             "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)application-tags"
+            }
+          }
+        },
+        "operationId": "GET-application-tags"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
           },
           {
-            "description": "Key to l3-network object",
             "in": "path",
-            "name": "network-id",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
+            "in": "path",
+            "name": "network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)c-tags",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)c-tags-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)s-tags",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)s-tags-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vlan-tags"
+              "$ref": "#/definitions/(config)application-tagsPOST"
             }
           }
         },
-        "operationId": "GET-vlan-tags"
+        "operationId": "POST-application-tags"
       },
       "put": {
         "consumes": [
@@ -60691,19 +65082,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "description": "Key to l3-network object",
-            "in": "path",
-            "name": "network-id",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)vlan-tags",
+            "name": "(config)application-tags",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks/related-network(config)vlan-tags-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)application-tags-TOP"
             }
           }
         ],
@@ -60711,14 +65095,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/related-networks/related-network(config)vlan-tags-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)application-tags-TOP"
             }
           }
         },
-        "operationId": "PUT-vlan-tags"
+        "operationId": "PUT-application-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags/c-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -60763,7 +65147,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-sriov-parameters"
+        "operationId": "DELETE-c-tags"
       },
       "get": {
         "produces": [
@@ -60808,13 +65192,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sriov-parameters"
+              "$ref": "#/definitions/(config)c-tags"
             }
           }
         },
-        "operationId": "GET-sriov-parameters"
+        "operationId": "GET-c-tags"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -60858,18 +65242,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)heat-vlan-filters",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)heat-vlan-filters-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)application-tags",
+            "name": "(config)c-tags",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)application-tags-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)c-tags-TOP"
             }
           }
         ],
@@ -60877,17 +65253,61 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)sriov-parametersPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)c-tags-TOP"
             }
           }
         },
-        "operationId": "POST-sriov-parameters"
-      },
-      "put": {
-        "consumes": [
+        "operationId": "PUT-c-tags"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags/s-tags": {
+      "delete": {
+        "produces": [
           "application/json",
           "application/xml"
         ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
+            "in": "path",
+            "name": "network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-s-tags"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -60924,29 +65344,23 @@
             "name": "network-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)sriov-parameters",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network(config)sriov-parameters-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network(config)sriov-parameters-TOP"
+              "$ref": "#/definitions/(config)s-tags"
             }
           }
         },
-        "operationId": "PUT-sriov-parameters"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags": {
-      "delete": {
+        "operationId": "GET-s-tags"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -60983,16 +65397,29 @@
             "name": "network-role",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)s-tags",
+            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)s-tags-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)s-tags-TOP"
+            }
           }
         },
-        "operationId": "DELETE-application-tags"
-      },
-      "get": {
+        "operationId": "PUT-s-tags"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/heat-vlan-filters": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -61033,19 +65460,12 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)application-tags"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-application-tags"
+        "operationId": "DELETE-heat-vlan-filters"
       },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -61082,33 +65502,17 @@
             "name": "network-role",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "**(config)c-tags",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)c-tags-TOP"
-            }
-          },
-          {
-            "in": "body",
-            "name": "**(config)s-tags",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)s-tags-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)application-tagsPOST"
+              "$ref": "#/definitions/(config)heat-vlan-filters"
             }
           }
         },
-        "operationId": "POST-application-tags"
+        "operationId": "GET-heat-vlan-filters"
       },
       "put": {
         "consumes": [
@@ -61154,10 +65558,10 @@
           },
           {
             "in": "body",
-            "name": "(config)application-tags",
+            "name": "(config)heat-vlan-filters",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)application-tags-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)heat-vlan-filters-TOP"
             }
           }
         ],
@@ -61165,14 +65569,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)application-tags-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)heat-vlan-filters-TOP"
             }
           }
         },
-        "operationId": "PUT-application-tags"
+        "operationId": "PUT-heat-vlan-filters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags/c-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -61197,19 +65601,6 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
-            "in": "path",
-            "name": "network-role",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -61217,7 +65608,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-c-tags"
+        "operationId": "DELETE-vf-module-parameters"
       },
       "get": {
         "produces": [
@@ -61243,32 +65634,19 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
-            "in": "path",
-            "name": "network-role",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)c-tags"
+              "$ref": "#/definitions/(config)vf-module-parameters"
             }
           }
         },
-        "operationId": "GET-c-tags"
+        "operationId": "GET-vf-module-parameters"
       },
-      "put": {
+      "post": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -61297,25 +65675,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
-            "in": "path",
-            "name": "network-role",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)c-tags",
+            "name": "**(config)param",
             "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)c-tags-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-parameters(config)param-TOP"
             }
           }
         ],
@@ -61323,15 +65688,17 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)c-tags-TOP"
+              "$ref": "#/definitions/(config)vf-module-parametersPOST"
             }
           }
         },
-        "operationId": "PUT-c-tags"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags/s-tags": {
-      "delete": {
+        "operationId": "POST-vf-module-parameters"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -61357,27 +65724,27 @@
             "type": "string"
           },
           {
-            "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
-            "in": "path",
-            "name": "network-role",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "(config)vf-module-parameters",
+            "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-parameters-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "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-parameters-TOP"
+            }
           }
         },
-        "operationId": "DELETE-s-tags"
-      },
-      "get": {
+        "operationId": "PUT-vf-module-parameters"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-parameters/param/{name}": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -61404,33 +65771,19 @@
           },
           {
             "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
-            "in": "path",
-            "name": "network-role",
+            "name": "name",
             "required": true,
             "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)s-tags"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-s-tags"
+        "operationId": "DELETE-param"
       },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -61457,39 +65810,26 @@
           },
           {
             "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
-            "in": "path",
-            "name": "network-role",
+            "name": "name",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)s-tags",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)s-tags-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters/application-tags(config)s-tags-TOP"
+              "$ref": "#/definitions/(config)param"
             }
           }
         },
-        "operationId": "PUT-s-tags"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/heat-vlan-filters": {
-      "delete": {
+        "operationId": "GET-param"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -61516,26 +65856,34 @@
           },
           {
             "in": "path",
-            "name": "vm-type",
+            "name": "name",
             "required": true,
             "type": "string"
           },
           {
-            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
-            "in": "path",
-            "name": "network-role",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "**(config)resource-resolution-data",
+            "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/vf-module-parameters/param(config)resource-resolution-data-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)paramPOST"
+            }
           }
         },
-        "operationId": "DELETE-heat-vlan-filters"
+        "operationId": "POST-param"
       },
-      "get": {
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -61562,33 +65910,32 @@
           },
           {
             "in": "path",
-            "name": "vm-type",
+            "name": "name",
             "required": true,
             "type": "string"
           },
           {
-            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
-            "in": "path",
-            "name": "network-role",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "name": "(config)param",
+            "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/vf-module-parameters(config)param-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)heat-vlan-filters"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-parameters(config)param-TOP"
             }
           }
         },
-        "operationId": "GET-heat-vlan-filters"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-param"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-parameters/param/{name}/resource-resolution-data": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -61615,39 +65962,19 @@
           },
           {
             "in": "path",
-            "name": "vm-type",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF",
-            "in": "path",
-            "name": "network-role",
+            "name": "name",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)heat-vlan-filters",
-            "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/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)heat-vlan-filters-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vms/vm/vm-networks/vm-network/sriov-parameters(config)heat-vlan-filters-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-heat-vlan-filters"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-parameters": {
-      "delete": {
+        "operationId": "DELETE-resource-resolution-data"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -61671,37 +65998,10 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-vf-module-parameters"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
           },
           {
             "in": "path",
-            "name": "vf-module-id",
+            "name": "name",
             "required": true,
             "type": "string"
           }
@@ -61710,11 +66010,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-parameters"
+              "$ref": "#/definitions/(config)resource-resolution-data"
             }
           }
         },
-        "operationId": "GET-vf-module-parameters"
+        "operationId": "GET-resource-resolution-data"
       },
       "post": {
         "consumes": [
@@ -61745,12 +66045,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)param",
+            "name": "**(config)resource-key",
             "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/vf-module-parameters(config)param-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-parameters/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         ],
@@ -61758,11 +66064,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-parametersPOST"
+              "$ref": "#/definitions/(config)resource-resolution-dataPOST"
             }
           }
         },
-        "operationId": "POST-vf-module-parameters"
+        "operationId": "POST-resource-resolution-data"
       },
       "put": {
         "consumes": [
@@ -61793,12 +66099,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vf-module-parameters",
+            "name": "(config)resource-resolution-data",
             "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-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-parameters/param(config)resource-resolution-data-TOP"
             }
           }
         ],
@@ -61806,14 +66118,14 @@
           "200": {
             "description": "No response was specified",
             "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-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-parameters/param(config)resource-resolution-data-TOP"
             }
           }
         },
-        "operationId": "PUT-vf-module-parameters"
+        "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -61844,39 +66156,6 @@
             "name": "name",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-param"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
           },
           {
             "in": "path",
@@ -61887,19 +66166,12 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)param"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-param"
+        "operationId": "DELETE-resource-key"
       },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -61931,23 +66203,21 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)resource-resolution-data",
-            "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/vf-module-parameters/param(config)resource-resolution-data-TOP"
-            }
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)paramPOST"
+              "$ref": "#/definitions/(config)resource-key"
             }
           }
         },
-        "operationId": "POST-param"
+        "operationId": "GET-resource-key"
       },
       "put": {
         "consumes": [
@@ -61984,12 +66254,18 @@
             "required": true,
             "type": "string"
           },
+          {
+            "in": "path",
+            "name": "name",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)param",
+            "name": "(config)resource-key",
             "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/vf-module-parameters(config)param-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-parameters/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         ],
@@ -61997,14 +66273,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-parameters(config)param-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-parameters/param/resource-resolution-data(config)resource-key-TOP"
             }
           }
         },
-        "operationId": "PUT-param"
+        "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-topology-identifier": {
       "delete": {
         "produces": [
           "application/json",
@@ -62029,12 +66305,6 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -62042,7 +66312,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-resource-resolution-data"
+        "operationId": "DELETE-vf-module-topology-identifier"
       },
       "get": {
         "produces": [
@@ -62068,25 +66338,19 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)resource-resolution-data"
+              "$ref": "#/definitions/(config)vf-module-topology-identifier"
             }
           }
         },
-        "operationId": "GET-resource-resolution-data"
+        "operationId": "GET-vf-module-topology-identifier"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -62115,18 +66379,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "**(config)resource-key",
+            "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/vf-module-parameters/param/resource-resolution-data(config)resource-key-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"
             }
           }
         ],
@@ -62134,17 +66392,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)resource-resolution-dataPOST"
+              "$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"
             }
           }
         },
-        "operationId": "POST-resource-resolution-data"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-vf-module-topology-identifier"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vnf-information": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -62168,35 +66424,16 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)resource-resolution-data",
-            "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/vf-module-parameters/param(config)resource-resolution-data-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-parameters/param(config)resource-resolution-data-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-resource-resolution-data"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
-      "delete": {
+        "operationId": "DELETE-vnf-information"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -62220,28 +66457,23 @@
             "name": "vf-module-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnf-information"
+            }
           }
         },
-        "operationId": "DELETE-resource-key"
+        "operationId": "GET-vnf-information"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -62267,27 +66499,23 @@
             "type": "string"
           },
           {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
+            "in": "body",
+            "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/vnf-information(config)onap-model-information-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)resource-key"
+              "$ref": "#/definitions/(config)vnf-informationPOST"
             }
           }
         },
-        "operationId": "GET-resource-key"
+        "operationId": "POST-vnf-information"
       },
       "put": {
         "consumes": [
@@ -62318,24 +66546,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
-            "name": "(config)resource-key",
+            "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/vf-module-topology/vf-module-parameters/param/resource-resolution-data(config)resource-key-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"
             }
           }
         ],
@@ -62343,14 +66559,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-parameters/param/resource-resolution-data(config)resource-key-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"
             }
           }
         },
-        "operationId": "PUT-resource-key"
+        "operationId": "PUT-vnf-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/vf-module-topology-identifier": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vnf-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -62382,7 +66598,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vf-module-topology-identifier"
+        "operationId": "DELETE-onap-model-information"
       },
       "get": {
         "produces": [
@@ -62414,11 +66630,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vf-module-topology-identifier"
+              "$ref": "#/definitions/(config)onap-model-information"
             }
           }
         },
-        "operationId": "GET-vf-module-topology-identifier"
+        "operationId": "GET-onap-model-information"
       },
       "put": {
         "consumes": [
@@ -62451,10 +66667,10 @@
           },
           {
             "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/vnf-information(config)onap-model-information-TOP"
             }
           }
         ],
@@ -62462,14 +66678,14 @@
           "200": {
             "description": "No response was specified",
             "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/vnf-information(config)onap-model-information-TOP"
             }
           }
         },
-        "operationId": "PUT-vf-module-topology-identifier"
+        "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vnf-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -62488,12 +66704,6 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -62521,12 +66731,6 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -62562,18 +66766,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
             "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/vnf-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-information(config)onap-model-information-TOP"
             }
           }
         ],
@@ -62610,18 +66808,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
             "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)vnf-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-information-TOP"
             }
           }
         ],
@@ -62629,14 +66821,14 @@
           "200": {
             "description": "No response was specified",
             "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(config)vnf-information-TOP"
             }
           }
         },
         "operationId": "PUT-vnf-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vnf-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -62655,12 +66847,6 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -62688,12 +66874,6 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
           }
         ],
         "responses": {
@@ -62729,18 +66909,12 @@
             "required": true,
             "type": "string"
           },
-          {
-            "in": "path",
-            "name": "vf-module-id",
-            "required": true,
-            "type": "string"
-          },
           {
             "in": "body",
             "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/vnf-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-information(config)onap-model-information-TOP"
             }
           }
         ],
@@ -62748,14 +66922,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vnf-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-information(config)onap-model-information-TOP"
             }
           }
         },
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-level-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -62781,7 +66955,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnf-information"
+        "operationId": "DELETE-vnf-level-oper-status"
       },
       "get": {
         "produces": [
@@ -62807,13 +66981,13 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnf-information"
+              "$ref": "#/definitions/(config)vnf-level-oper-status"
             }
           }
         },
-        "operationId": "GET-vnf-information"
+        "operationId": "GET-vnf-level-oper-status"
       },
-      "post": {
+      "put": {
         "consumes": [
           "application/json",
           "application/xml"
@@ -62838,10 +67012,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)onap-model-information",
+            "name": "(config)vnf-level-oper-status",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-level-oper-status-TOP"
             }
           }
         ],
@@ -62849,17 +67023,15 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnf-informationPOST"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-level-oper-status-TOP"
             }
           }
         },
-        "operationId": "POST-vnf-information"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+        "operationId": "PUT-vnf-level-oper-status"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-network-collections": {
+      "delete": {
         "produces": [
           "application/json",
           "application/xml"
@@ -62877,29 +67049,16 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)vnf-information",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-information-TOP"
-            }
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-information-TOP"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "PUT-vnf-information"
-      }
-    },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-information/onap-model-information": {
-      "delete": {
+        "operationId": "DELETE-vnf-network-collections"
+      },
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -62921,12 +67080,19 @@
         ],
         "responses": {
           "200": {
-            "description": "No response was specified"
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnf-network-collections"
+            }
           }
         },
-        "operationId": "DELETE-onap-model-information"
+        "operationId": "GET-vnf-network-collections"
       },
-      "get": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
         "produces": [
           "application/json",
           "application/xml"
@@ -62944,17 +67110,25 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnf-network-collection",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections(config)vnf-network-collection-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)onap-model-information"
+              "$ref": "#/definitions/(config)vnf-network-collectionsPOST"
             }
           }
         },
-        "operationId": "GET-onap-model-information"
+        "operationId": "POST-vnf-network-collections"
       },
       "put": {
         "consumes": [
@@ -62981,10 +67155,10 @@
           },
           {
             "in": "body",
-            "name": "(config)onap-model-information",
+            "name": "(config)vnf-network-collections",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-network-collections-TOP"
             }
           }
         ],
@@ -62992,14 +67166,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-information(config)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-network-collections-TOP"
             }
           }
         },
-        "operationId": "PUT-onap-model-information"
+        "operationId": "PUT-vnf-network-collections"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-level-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-network-collections/vnf-network-collection/{network-instance-group-function}": {
       "delete": {
         "produces": [
           "application/json",
@@ -63018,6 +67192,13 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Network Instance-Group function in A&AI",
+            "in": "path",
+            "name": "network-instance-group-function",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -63025,7 +67206,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnf-level-oper-status"
+        "operationId": "DELETE-vnf-network-collection"
       },
       "get": {
         "produces": [
@@ -63045,17 +67226,81 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Network Instance-Group function in A&AI",
+            "in": "path",
+            "name": "network-instance-group-function",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnf-network-collection"
+            }
+          }
+        },
+        "operationId": "GET-vnf-network-collection"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "Keep as M",
+            "in": "path",
+            "name": "service-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Network Instance-Group function in A&AI",
+            "in": "path",
+            "name": "network-instance-group-function",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)networks-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnf-floating-ip",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)vnf-floating-ip-TOP"
+            }
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnf-level-oper-status"
+              "$ref": "#/definitions/(config)vnf-network-collectionPOST"
             }
           }
         },
-        "operationId": "GET-vnf-level-oper-status"
+        "operationId": "POST-vnf-network-collection"
       },
       "put": {
         "consumes": [
@@ -63080,12 +67325,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Network Instance-Group function in A&AI",
+            "in": "path",
+            "name": "network-instance-group-function",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnf-level-oper-status",
+            "name": "(config)vnf-network-collection",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-level-oper-status-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections(config)vnf-network-collection-TOP"
             }
           }
         ],
@@ -63093,14 +67345,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-level-oper-status-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections(config)vnf-network-collection-TOP"
             }
           }
         },
-        "operationId": "PUT-vnf-level-oper-status"
+        "operationId": "PUT-vnf-network-collection"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-network-collections": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-network-collections/vnf-network-collection/{network-instance-group-function}/networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -63119,6 +67371,13 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Network Instance-Group function in A&AI",
+            "in": "path",
+            "name": "network-instance-group-function",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
@@ -63126,7 +67385,7 @@
             "description": "No response was specified"
           }
         },
-        "operationId": "DELETE-vnf-network-collections"
+        "operationId": "DELETE-networks"
       },
       "get": {
         "produces": [
@@ -63146,17 +67405,24 @@
             "name": "vnf-id",
             "required": true,
             "type": "string"
+          },
+          {
+            "description": "Network Instance-Group function in A&AI",
+            "in": "path",
+            "name": "network-instance-group-function",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnf-network-collections"
+              "$ref": "#/definitions/(config)networks"
             }
           }
         },
-        "operationId": "GET-vnf-network-collections"
+        "operationId": "GET-networks"
       },
       "post": {
         "consumes": [
@@ -63181,12 +67447,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Network Instance-Group function in A&AI",
+            "in": "path",
+            "name": "network-instance-group-function",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "**(config)vnf-network-collection",
+            "name": "**(config)network",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections(config)vnf-network-collection-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection/networks(config)network-TOP"
             }
           }
         ],
@@ -63194,11 +67467,11 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnf-network-collectionsPOST"
+              "$ref": "#/definitions/(config)networksPOST"
             }
           }
         },
-        "operationId": "POST-vnf-network-collections"
+        "operationId": "POST-networks"
       },
       "put": {
         "consumes": [
@@ -63223,12 +67496,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Network Instance-Group function in A&AI",
+            "in": "path",
+            "name": "network-instance-group-function",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnf-network-collections",
+            "name": "(config)networks",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-network-collections-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)networks-TOP"
             }
           }
         ],
@@ -63236,14 +67516,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data(config)vnf-network-collections-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)networks-TOP"
             }
           }
         },
-        "operationId": "PUT-vnf-network-collections"
+        "operationId": "PUT-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-network-collections/vnf-network-collection/{network-instance-group-function}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-network-collections/vnf-network-collection/{network-instance-group-function}/networks/network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -63269,57 +67549,23 @@
             "name": "network-instance-group-function",
             "required": true,
             "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-vnf-network-collection"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "description": "Keep as M",
-            "in": "path",
-            "name": "service-instance-id",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "path",
-            "name": "vnf-id",
-            "required": true,
-            "type": "string"
           },
           {
-            "description": "Network Instance-Group function in A&AI",
+            "description": "Index into network-topology-identifier structure",
             "in": "path",
-            "name": "network-instance-group-function",
+            "name": "network-id",
             "required": true,
             "type": "string"
           }
         ],
         "responses": {
           "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)vnf-network-collection"
-            }
+            "description": "No response was specified"
           }
         },
-        "operationId": "GET-vnf-network-collection"
+        "operationId": "DELETE-network"
       },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
+      "get": {
         "produces": [
           "application/json",
           "application/xml"
@@ -63346,23 +67592,22 @@
             "type": "string"
           },
           {
-            "in": "body",
-            "name": "**(config)vnf-floating-ip",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)vnf-floating-ip-TOP"
-            }
+            "description": "Index into network-topology-identifier structure",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
           }
         ],
         "responses": {
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/(config)vnf-network-collectionPOST"
+              "$ref": "#/definitions/(config)network"
             }
           }
         },
-        "operationId": "POST-vnf-network-collection"
+        "operationId": "GET-network"
       },
       "put": {
         "consumes": [
@@ -63394,12 +67639,19 @@
             "required": true,
             "type": "string"
           },
+          {
+            "description": "Index into network-topology-identifier structure",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          },
           {
             "in": "body",
-            "name": "(config)vnf-network-collection",
+            "name": "(config)network",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections(config)vnf-network-collection-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection/networks(config)network-TOP"
             }
           }
         ],
@@ -63407,14 +67659,14 @@
           "200": {
             "description": "No response was specified",
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections(config)vnf-network-collection-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection/networks(config)network-TOP"
             }
           }
         },
-        "operationId": "PUT-vnf-network-collection"
+        "operationId": "PUT-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-network-collections/vnf-network-collection/{network-instance-group-function}/vnf-floating-ip": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-network-collections/vnf-network-collection/{network-instance-group-function}/vnf-floating-ip": {
       "delete": {
         "produces": [
           "application/json",
@@ -63585,7 +67837,7 @@
         "operationId": "PUT-vnf-floating-ip"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-network-collections/vnf-network-collection/{network-instance-group-function}/vnf-floating-ip/ip-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-network-collections/vnf-network-collection/{network-instance-group-function}/vnf-floating-ip/ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -63707,7 +67959,7 @@
         "operationId": "PUT-ip-addresses"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources": {
       "delete": {
         "produces": [
           "application/json",
@@ -63808,7 +68060,7 @@
         "operationId": "PUT-vnf-provided-allotted-resources"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input": {
       "delete": {
         "produces": [
           "application/json",
@@ -63967,7 +68219,7 @@
         "operationId": "PUT-vnf-request-input"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-input-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-input-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -64110,7 +68362,7 @@
         "operationId": "PUT-vnf-input-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-input-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-input-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -64277,7 +68529,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-input-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-input-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -64444,7 +68696,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -64581,7 +68833,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-network-instance-group-ids/{vnf-network-instance-group-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-network-instance-group-ids/{vnf-network-instance-group-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -64703,7 +68955,7 @@
         "operationId": "PUT-vnf-network-instance-group-ids"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -64846,7 +69098,7 @@
         "operationId": "PUT-vnf-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}": {
       "delete": {
         "produces": [
           "application/json",
@@ -65025,7 +69277,7 @@
         "operationId": "PUT-vnf-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}/related-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}/related-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -65196,7 +69448,7 @@
         "operationId": "PUT-related-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -65395,7 +69647,7 @@
         "operationId": "PUT-related-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}/vlan-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}/vlan-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -65538,7 +69790,7 @@
         "operationId": "PUT-vlan-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}/subnets-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}/subnets-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -65709,7 +69961,7 @@
         "operationId": "PUT-subnets-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}/subnets-data/subnet-data/{sdnc-subnet-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-request-input/vnf-networks/vnf-network/{network-role}/subnets-data/subnet-data/{sdnc-subnet-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -65852,7 +70104,7 @@
         "operationId": "PUT-subnet-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups": {
       "delete": {
         "produces": [
           "application/json",
@@ -65995,7 +70247,7 @@
         "operationId": "PUT-vnf-sub-interface-groups"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}": {
       "delete": {
         "produces": [
           "application/json",
@@ -66218,7 +70470,7 @@
         "operationId": "PUT-vnf-sub-interface-group"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/customer-bonding-requests": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/customer-bonding-requests": {
       "delete": {
         "produces": [
           "application/json",
@@ -66433,7 +70685,7 @@
         "operationId": "PUT-customer-bonding-requests"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/customer-bonding-requests/customer-bonding-request/{configuration-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/customer-bonding-requests/customer-bonding-request/{configuration-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -66609,7 +70861,7 @@
         "operationId": "PUT-customer-bonding-request"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs": {
       "delete": {
         "produces": [
           "application/json",
@@ -66824,7 +71076,7 @@
         "operationId": "PUT-vnfcs"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -67067,7 +71319,7 @@
         "operationId": "PUT-vnfc"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics": {
       "delete": {
         "produces": [
           "application/json",
@@ -67310,7 +71562,7 @@
         "operationId": "PUT-vnics"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -67577,7 +71829,7 @@
         "operationId": "PUT-vnic"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces": {
       "delete": {
         "produces": [
           "application/json",
@@ -67844,7 +72096,7 @@
         "operationId": "PUT-sub-interfaces"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces/sub-interface/{sub-interface-port-name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces/sub-interface/{sub-interface-port-name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -68151,7 +72403,7 @@
         "operationId": "PUT-sub-interface"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces/sub-interface/{sub-interface-port-name}/sub-interface-ip-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces/sub-interface/{sub-interface-port-name}/sub-interface-ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -68442,7 +72694,7 @@
         "operationId": "PUT-sub-interface-ip-addresses"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces/sub-interface/{sub-interface-port-name}/sub-interface-ip-addresses/ip-addresses": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces/sub-interface/{sub-interface-port-name}/sub-interface-ip-addresses/ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -68654,7 +72906,7 @@
         "operationId": "PUT-ip-addresses"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces/sub-interface/{sub-interface-port-name}/sub-interface-network": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces/sub-interface/{sub-interface-port-name}/sub-interface-network": {
       "delete": {
         "produces": [
           "application/json",
@@ -68866,7 +73118,7 @@
         "operationId": "PUT-sub-interface-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces/sub-interface/{sub-interface-port-name}/vlan-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-sub-interface-groups/vnf-sub-interface-group/{vnfc-instance-group-function}/{network-instance-group-function}/{parent-port-role}/vnfcs/vnfc/{vnfc-name}/vnics/vnic/{vnic-port-name}/sub-interfaces/sub-interface/{sub-interface-port-name}/vlan-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -69078,7 +73330,7 @@
         "operationId": "PUT-vlan-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -69245,7 +73497,7 @@
         "operationId": "PUT-vnf-topology"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -69346,7 +73598,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-parameters-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-parameters-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -69489,7 +73741,7 @@
         "operationId": "PUT-vnf-parameters-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-parameters-data/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-parameters-data/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -69656,7 +73908,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-parameters-data/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-parameters-data/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -69823,7 +74075,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-parameters-data/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-parameters-data/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -69960,7 +74212,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -70111,7 +74363,7 @@
         "operationId": "PUT-vnf-resource-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/availability-zones": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/availability-zones": {
       "delete": {
         "produces": [
           "application/json",
@@ -70212,7 +74464,7 @@
         "operationId": "PUT-availability-zones"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -70355,7 +74607,7 @@
         "operationId": "PUT-vnf-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}": {
       "delete": {
         "produces": [
           "application/json",
@@ -70534,7 +74786,7 @@
         "operationId": "PUT-vnf-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks": {
       "delete": {
         "produces": [
           "application/json",
@@ -70705,7 +74957,7 @@
         "operationId": "PUT-related-networks"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -70904,7 +75156,7 @@
         "operationId": "PUT-related-network"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}/vlan-tags": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/related-networks/related-network/{network-id}/vlan-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -71047,7 +75299,7 @@
         "operationId": "PUT-vlan-tags"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/subnets-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/subnets-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -71218,7 +75470,7 @@
         "operationId": "PUT-subnets-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/subnets-data/subnet-data/{sdnc-subnet-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/subnets-data/subnet-data/{sdnc-subnet-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -71361,7 +75613,7 @@
         "operationId": "PUT-subnet-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-topology-identifier-structure": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-topology-identifier-structure": {
       "delete": {
         "produces": [
           "application/json",
@@ -71462,7 +75714,7 @@
         "operationId": "PUT-vnf-topology-identifier-structure"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -71545,7 +75797,7 @@
         "operationId": "PUT-service-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources": {
       "delete": {
         "produces": [
           "application/json",
@@ -71632,7 +75884,7 @@
         "operationId": "PUT-tunnelxconn-allotted-resources"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -71755,7 +76007,7 @@
         "operationId": "PUT-tunnelxconn-allotted-resource"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -71894,7 +76146,7 @@
         "operationId": "PUT-allotted-resource-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -71974,7 +76226,7 @@
         "operationId": "PUT-allotted-resource-oper-status"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -72036,42 +76288,42 @@
           },
           {
             "in": "body",
-            "name": "**(config)sdnc-request-header",
+            "name": "**(config)request-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)request-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)tunnelxconn-request-input",
+            "name": "**(config)sdnc-request-header",
             "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"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/allotted-resource-operation-information(config)sdnc-request-header-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)request-information",
+            "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)request-information-TOP"
+              "$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)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"
             }
           }
         ],
@@ -72121,7 +76373,7 @@
         "operationId": "PUT-allotted-resource-operation-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -72236,7 +76488,7 @@
         "operationId": "PUT-allotted-resource-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/allotted-resource-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -72316,7 +76568,7 @@
         "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/request-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/request-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -72396,7 +76648,7 @@
         "operationId": "PUT-request-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -72476,7 +76728,7 @@
         "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -72591,7 +76843,7 @@
         "operationId": "PUT-service-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/allotted-resource-operation-information/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -72671,7 +76923,7 @@
         "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": {
+    "/restconf/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",
@@ -72751,7 +77003,7 @@
         "operationId": "PUT-tunnelxconn-request-input"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -72866,7 +77118,7 @@
         "operationId": "PUT-tunnelxconn-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -73005,7 +77257,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -73144,7 +77396,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -73260,7 +77512,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -73330,18 +77582,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)allotted-resource-identifiers",
+            "name": "**(config)onap-model-information",
             "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)onap-model-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)onap-model-information",
+            "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)onap-model-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/allotted-resource-data/tunnelxconn-topology(config)allotted-resource-identifiers-TOP"
             }
           },
           {
@@ -73399,7 +77651,7 @@
         "operationId": "PUT-tunnelxconn-topology"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/allotted-resource-identifiers": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/allotted-resource-identifiers": {
       "delete": {
         "produces": [
           "application/json",
@@ -73479,7 +77731,7 @@
         "operationId": "PUT-allotted-resource-identifiers"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/onap-model-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -73559,7 +77811,7 @@
         "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": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -73639,7 +77891,7 @@
         "operationId": "PUT-tunnelxconn-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -73754,7 +78006,7 @@
         "operationId": "PUT-tunnelxconn-parameters"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-parameters/param/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -73893,7 +78145,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-parameters/param/{name}/resource-resolution-data": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -74032,7 +78284,7 @@
         "operationId": "PUT-resource-resolution-data"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-data/tunnelxconn-topology/tunnelxconn-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -74148,7 +78400,7 @@
         "operationId": "PUT-resource-key"
       }
     },
-    "/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-status": {
+    "/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/allotted-resource-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -74228,7 +78480,7 @@
         "operationId": "PUT-allotted-resource-status"
       }
     },
-    "/operational/GENERIC-RESOURCE-API:brg-allotted-resources": {
+    "/restconf/operational/GENERIC-RESOURCE-API:brg-allotted-resources": {
       "get": {
         "produces": [
           "application/json",
@@ -74245,7 +78497,7 @@
         "operationId": "GET-brg-allotted-resources"
       }
     },
-    "/operational/GENERIC-RESOURCE-API:connection-attachment-allotted-resources": {
+    "/restconf/operational/GENERIC-RESOURCE-API:connection-attachment-allotted-resources": {
       "get": {
         "produces": [
           "application/json",
@@ -74262,7 +78514,7 @@
         "operationId": "GET-connection-attachment-allotted-resources"
       }
     },
-    "/operational/GENERIC-RESOURCE-API:contrail-route-allotted-resources": {
+    "/restconf/operational/GENERIC-RESOURCE-API:contrail-route-allotted-resources": {
       "get": {
         "produces": [
           "application/json",
@@ -74279,7 +78531,7 @@
         "operationId": "GET-contrail-route-allotted-resources"
       }
     },
-    "/operational/GENERIC-RESOURCE-API:generic-configurations": {
+    "/restconf/operational/GENERIC-RESOURCE-API:generic-configurations": {
       "get": {
         "produces": [
           "application/json",
@@ -74296,7 +78548,7 @@
         "operationId": "GET-generic-configurations"
       }
     },
-    "/operational/GENERIC-RESOURCE-API:port-mirror-configurations": {
+    "/restconf/operational/GENERIC-RESOURCE-API:port-mirror-configurations": {
       "get": {
         "produces": [
           "application/json",
@@ -74313,7 +78565,7 @@
         "operationId": "GET-port-mirror-configurations"
       }
     },
-    "/operational/GENERIC-RESOURCE-API:preload-information": {
+    "/restconf/operational/GENERIC-RESOURCE-API:preload-information": {
       "get": {
         "produces": [
           "application/json",
@@ -74330,7 +78582,7 @@
         "operationId": "GET-preload-information"
       }
     },
-    "/operational/GENERIC-RESOURCE-API:security-zone-allotted-resources": {
+    "/restconf/operational/GENERIC-RESOURCE-API:security-zone-allotted-resources": {
       "get": {
         "produces": [
           "application/json",
@@ -74347,7 +78599,7 @@
         "operationId": "GET-security-zone-allotted-resources"
       }
     },
-    "/operational/GENERIC-RESOURCE-API:services": {
+    "/restconf/operational/GENERIC-RESOURCE-API:services": {
       "get": {
         "produces": [
           "application/json",
@@ -74364,7 +78616,7 @@
         "operationId": "GET-services"
       }
     },
-    "/operational/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources": {
+    "/restconf/operational/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources": {
       "get": {
         "produces": [
           "application/json",
@@ -74381,7 +78633,7 @@
         "operationId": "GET-tunnelxconn-allotted-resources"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:brg-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:brg-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74412,7 +78664,7 @@
         "operationId": "brg-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:connection-attachment-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:connection-attachment-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74443,7 +78695,7 @@
         "operationId": "connection-attachment-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:contrail-route-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:contrail-route-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74474,7 +78726,7 @@
         "operationId": "contrail-route-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:generic-configuration-notification": {
+    "/restconf/operations/GENERIC-RESOURCE-API:generic-configuration-notification": {
       "post": {
         "consumes": [
           "application/json",
@@ -74502,7 +78754,7 @@
         "operationId": "generic-configuration-notification"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:generic-configuration-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:generic-configuration-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74533,7 +78785,7 @@
         "operationId": "generic-configuration-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:getpathsegment-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:getpathsegment-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74564,7 +78816,7 @@
         "operationId": "getpathsegment-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:network-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74595,7 +78847,38 @@
         "operationId": "network-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:policy-update-notify-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:pnf-topology-operation": {
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/(pnf-topology-operation)input-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(pnf-topology-operation)output-TOP"
+            }
+          }
+        },
+        "operationId": "pnf-topology-operation"
+      }
+    },
+    "/restconf/operations/GENERIC-RESOURCE-API:policy-update-notify-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74626,7 +78909,7 @@
         "operationId": "policy-update-notify-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:port-mirror-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:port-mirror-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74657,7 +78940,7 @@
         "operationId": "port-mirror-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:preload-network-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:preload-network-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74688,7 +78971,7 @@
         "operationId": "preload-network-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:preload-vf-module-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:preload-vf-module-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74719,7 +79002,7 @@
         "operationId": "preload-vf-module-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:security-zone-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:security-zone-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74750,7 +79033,7 @@
         "operationId": "security-zone-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:service-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:service-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74781,7 +79064,7 @@
         "operationId": "service-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:tunnelxconn-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:tunnelxconn-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74812,7 +79095,7 @@
         "operationId": "tunnelxconn-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:vf-module-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:vf-module-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -74843,7 +79126,7 @@
         "operationId": "vf-module-topology-operation"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:vnf-get-resource-request": {
+    "/restconf/operations/GENERIC-RESOURCE-API:vnf-get-resource-request": {
       "post": {
         "consumes": [
           "application/json",
@@ -74874,7 +79157,7 @@
         "operationId": "vnf-get-resource-request"
       }
     },
-    "/operations/GENERIC-RESOURCE-API:vnf-topology-operation": {
+    "/restconf/operations/GENERIC-RESOURCE-API:vnf-topology-operation": {
       "post": {
         "consumes": [
           "application/json",
@@ -75056,6 +79339,39 @@
       },
       "type": "object"
     },
+    "(config)aggregate-route-policyPOST": {
+      "properties": {
+        "aggregate-route-policy-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "ipv4-aggregate-route-level": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "ipv6-aggregate-route-level": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "(config)aggregate-routesPOST": {
+      "properties": {
+        "cidr-mask": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "ip-version": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Use values 4 or 6."
+        },
+        "route-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique id"
+        },
+        "start-address": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
     "(config)allotted-resource-dataPOST": {
       "properties": {
         "allotted-resource-oper-status": {
@@ -75416,6 +79732,14 @@
       },
       "type": "object"
     },
+    "(config)configuration-idsPOST": {
+      "properties": {
+        "configuration-id": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
     "(config)configuration-informationPOST": {
       "properties": {
         "configuration-id": {
@@ -75965,6 +80289,32 @@
       },
       "type": "object"
     },
+    "(config)dhcp-subnet-assignmentPOST": {
+      "properties": {
+        "ip-version": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "neutron-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Same as subnet-id in subnet-data structure"
+        }
+      },
+      "type": "object"
+    },
+    "(config)dhcp-subnet-assignmentsPOST": {
+      "properties": {
+        "dhcp-subnet-assignment": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "(config)entitlement-pool-listPOST": {
       "properties": {
         "action": {
@@ -76076,12 +80426,26 @@
     },
     "(config)gc-request-inputPOST": {
       "properties": {
+        "configuration-ids": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/gc-request-input(config)configuration-ids"
+          },
+          "type": "array"
+        },
         "input-parameters": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/gc-request-input(config)input-parameters"
           },
           "type": "object"
         },
+        "rebuild": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Value will indicate what to rebuild"
+        },
+        "vf-module-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "This is mandatory in case of rebuild"
+        },
         "vnf-id": {
           "$ref": "#/definitions/Optional.empty"
         }
@@ -76344,6 +80708,18 @@
     },
     "(config)network-instance-groupPOST": {
       "properties": {
+        "aggregate-route-policy": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-route-policy"
+          },
+          "type": "object"
+        },
+        "aggregate-routes": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-routes"
+          },
+          "type": "array"
+        },
         "network-instance-group-function": {
           "$ref": "#/definitions/Optional.empty"
         },
@@ -76484,6 +80860,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "network-input-parameters": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/network-request-input(config)network-input-parameters"
@@ -76567,6 +80947,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "network-assignments": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-assignments"
@@ -76613,6 +80997,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "assigned, unassigned"
         },
+        "neutron-network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Neutron-network-id assigned by PO/RO"
+        },
         "vlan-tag-id": {
           "$ref": "#/definitions/Optional.empty"
         },
@@ -76679,6 +81067,78 @@
       },
       "type": "object"
     },
+    "(config)pnf-dataPOST": {
+      "properties": {
+        "pnf-details": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-details"
+          },
+          "type": "object"
+        },
+        "pnf-level-oper-status": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-level-oper-status"
+          },
+          "type": "object"
+        },
+        "pnf-request-input": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-request-input"
+          },
+          "type": "object"
+        },
+        "pnf-topology": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-topology"
+          },
+          "type": "object"
+        },
+        "request-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)request-information"
+          },
+          "type": "object"
+        },
+        "sdnc-request-header": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)sdnc-request-header"
+          },
+          "type": "object"
+        },
+        "service-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)service-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "(config)pnf-detailsPOST": {
+      "properties": {
+        "onap-model-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-details(config)onap-model-information"
+          },
+          "type": "object"
+        },
+        "pnf-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "pnfId*Identifier of this Pnf information element. CORRELATIONID = PNF-NAME (A&AI)"
+        },
+        "pnf-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "pnf-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "pnfType (template)*Type of Resource. NEW type: PNF (pre-defined in SDC)"
+        }
+      },
+      "required": [
+        "pnf-id"
+      ],
+      "type": "object"
+    },
     "(config)pnf-informationPOST": {
       "properties": {
         "onap-model-information": {
@@ -76697,6 +81157,189 @@
       },
       "type": "object"
     },
+    "(config)pnf-input-parametersPOST": {
+      "properties": {
+        "param": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters(config)param"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "(config)pnf-level-oper-statusPOST": {
+      "properties": {
+        "create-timestamp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Not currently populated in service data."
+        },
+        "last-action": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "should be list of possible request-actions"
+        },
+        "last-order-status": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "last-rpc-action": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "last-svc-request-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Not currently populated in service data."
+        },
+        "modify-timestamp": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "order-status": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "TBD - do we need Request failed statuses? RequestFailed | InProgressTimeout"
+        }
+      },
+      "type": "object"
+    },
+    "(config)pnf-parameters-dataPOST": {
+      "properties": {
+        "param": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "(config)pnf-request-inputPOST": {
+      "properties": {
+        "aic-clli": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Not expected to be used"
+        },
+        "aic-cloud-region": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The AIC cloud region which maps to contrail versions"
+        },
+        "cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
+        "pnf-input-parameters": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-request-input(config)pnf-input-parameters"
+          },
+          "type": "object"
+        },
+        "pnf-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "request-version": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "keep this? e.g. 1702"
+        },
+        "tenant": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "(config)pnf-response-informationPOST": {
+      "properties": {
+        "instance-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "object-path": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "restconf retrieval path to this particular objectE.g. restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/service-topology/"
+        }
+      },
+      "type": "object"
+    },
+    "(config)pnf-topology-identifier-structurePOST": {
+      "properties": {
+        "pnf-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "pnf-name": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "optionally comes from pnf-request-input container or is assigned by sdn-c"
+        },
+        "pnf-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "In preload tree, this label is used for the vf-module-type"
+        }
+      },
+      "type": "object"
+    },
+    "(config)pnf-topologyPOST": {
+      "properties": {
+        "aic-clli": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Not expected to be used"
+        },
+        "aic-cloud-region": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The AIC cloud region which maps to contrail versions"
+        },
+        "cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
+        "onap-model-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)onap-model-information"
+          },
+          "type": "object"
+        },
+        "pnf-parameters-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data"
+          },
+          "type": "object"
+        },
+        "pnf-topology-identifier-structure": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-topology-identifier-structure"
+          },
+          "type": "object"
+        },
+        "sdnc-generated-cloud-resources": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicate if source is sdnc generated cloud param.When true, the parameters are literal HEAT template parameter names;When false, the parameters need to be converted to HEAT format"
+        },
+        "tenant": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "(config)pnfPOST": {
+      "properties": {
+        "pnf-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf(config)pnf-data"
+          },
+          "type": "object"
+        },
+        "pnf-id": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "required": [
+        "pnf-id"
+      ],
+      "type": "object"
+    },
+    "(config)pnfsPOST": {
+      "properties": {
+        "pnf": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "(config)port-mirror-configuration-assignmentsPOST": {
       "properties": {
         "cloud-owner": {
@@ -76827,6 +81470,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "dest-port": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configuration-request-input(config)dest-port"
@@ -77439,6 +82086,12 @@
           },
           "type": "object"
         },
+        "pnfs": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)pnfs"
+          },
+          "type": "object"
+        },
         "provided-allotted-resources": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)provided-allotted-resources"
@@ -77931,6 +82584,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "Assuming HEAT template network role tag parameter - not used"
         },
+        "neutron-network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Neutron network id assigned by PO/RP"
+        },
         "vlan-tag-id": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Vlan tag assigned to subinterface port"
@@ -78213,6 +82870,12 @@
     },
     "(config)vf-module-assignmentsPOST": {
       "properties": {
+        "dhcp-subnet-assignments": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments"
+          },
+          "type": "object"
+        },
         "vf-module-status": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration status from AAI - to be set by SDNC"
@@ -78379,6 +83042,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "request-version": {
           "$ref": "#/definitions/Optional.empty",
           "description": "keep this?"
@@ -78436,6 +83103,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "onap-model-information": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology(config)onap-model-information"
@@ -78920,6 +83591,12 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "Network Instance-Group id in A&AI"
         },
+        "networks": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)networks"
+          },
+          "type": "object"
+        },
         "vnf-floating-ip": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)vnf-floating-ip"
@@ -79030,6 +83707,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "request-version": {
           "$ref": "#/definitions/Optional.empty"
         },
@@ -79174,6 +83855,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "onap-model-information": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-topology(config)onap-model-information"
@@ -79208,6 +83893,23 @@
       },
       "type": "object"
     },
+    "(config)vnf-vnr-rebuild-dataPOST": {
+      "properties": {
+        "vnf-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "vnf-service-instance-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "vnrs-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/vnf-vnr-rebuild-data(config)vnrs-data"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "(config)vnfPOST": {
       "properties": {
         "param": {
@@ -79624,6 +84326,10 @@
         "upper-tag-id": {
           "$ref": "#/definitions/Optional.empty"
         },
+        "vf-module-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "This is mandatory in case of rebuild"
+        },
         "vnf-id": {
           "$ref": "#/definitions/Optional.empty"
         },
@@ -79636,6 +84342,35 @@
       },
       "type": "object"
     },
+    "(config)vnrs-dataPOST": {
+      "properties": {
+        "configuration-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "lower-tag-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "network-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "network-instance-group-function": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "network-instance-group-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "parent-port-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "upper-tag-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "vnfc-instance-group-function": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
     "(config)vpn-binding-policyPOST": {
       "properties": {
         "global-route-target": {
@@ -79906,6 +84641,12 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "the request id from the request message for which this is the responseKeep as M"
         },
+        "GENERIC-RESOURCE-API:vnf-vnr-rebuild-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)vnf-vnr-rebuild-data"
+          },
+          "type": "object"
+        },
         "GENERIC-RESOURCE-API:vnr-parameters": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API(config)vnr-parameters"
@@ -80190,6 +84931,96 @@
       },
       "type": "object"
     },
+    "(pnf-topology-operation)input": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-details": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)pnf-details"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-request-input": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)pnf-request-input"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:request-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)request-information"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:sdnc-request-header": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)sdnc-request-header"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:service-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)service-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "(pnf-topology-operation)input-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:input": {
+          "items": {
+            "$ref": "#/definitions/(pnf-topology-operation)input"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "(pnf-topology-operation)output": {
+      "properties": {
+        "GENERIC-RESOURCE-API:ack-final-indicator": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Expected to be Y or N."
+        },
+        "GENERIC-RESOURCE-API:pnf-response-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)pnf-response-information"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:response-code": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "a success code or an defined error codeKeep as M"
+        },
+        "GENERIC-RESOURCE-API:response-message": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "message included for error code"
+        },
+        "GENERIC-RESOURCE-API:service-response-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)service-response-information"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:svc-request-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "the request id from the request message for which this is the responseKeep as M"
+        }
+      },
+      "type": "object"
+    },
+    "(pnf-topology-operation)output-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:output": {
+          "items": {
+            "$ref": "#/definitions/(pnf-topology-operation)output"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
     "(policy-update-notify-operation)input": {
       "properties": {
         "GENERIC-RESOURCE-API:policy-name": {
@@ -81290,12 +86121,26 @@
     },
     "GENERIC-RESOURCE-API(config)gc-request-input": {
       "properties": {
+        "GENERIC-RESOURCE-API:configuration-ids": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/gc-request-input(config)configuration-ids"
+          },
+          "type": "array"
+        },
         "GENERIC-RESOURCE-API:input-parameters": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/gc-request-input(config)input-parameters"
           },
           "type": "object"
         },
+        "GENERIC-RESOURCE-API:rebuild": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Value will indicate what to rebuild"
+        },
+        "GENERIC-RESOURCE-API:vf-module-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "This is mandatory in case of rebuild"
+        },
         "GENERIC-RESOURCE-API:vnf-id": {
           "$ref": "#/definitions/Optional.empty"
         }
@@ -81454,6 +86299,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:network-input-parameters": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/network-request-input(config)network-input-parameters"
@@ -81507,6 +86356,109 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API(config)pnf-details": {
+      "properties": {
+        "GENERIC-RESOURCE-API:onap-model-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-details(config)onap-model-information"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "pnfId*Identifier of this Pnf information element. CORRELATIONID = PNF-NAME (A&AI)"
+        },
+        "GENERIC-RESOURCE-API:pnf-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:pnf-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "pnfType (template)*Type of Resource. NEW type: PNF (pre-defined in SDC)"
+        }
+      },
+      "required": [
+        "GENERIC-RESOURCE-API:pnf-id"
+      ],
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API(config)pnf-details-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-details": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)pnf-details"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API(config)pnf-request-input": {
+      "properties": {
+        "GENERIC-RESOURCE-API:aic-clli": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Not expected to be used"
+        },
+        "GENERIC-RESOURCE-API:aic-cloud-region": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The AIC cloud region which maps to contrail versions"
+        },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
+        "GENERIC-RESOURCE-API:pnf-input-parameters": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-request-input(config)pnf-input-parameters"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:request-version": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "keep this? e.g. 1702"
+        },
+        "GENERIC-RESOURCE-API:tenant": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API(config)pnf-request-input-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-request-input": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)pnf-request-input"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API(config)pnf-response-information": {
+      "properties": {
+        "GENERIC-RESOURCE-API:instance-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:object-path": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "restconf retrieval path to this particular objectE.g. restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/service-topology/"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API(config)pnf-response-information-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-response-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)pnf-response-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API(config)port-mirror-configuration-request-input": {
       "properties": {
         "GENERIC-RESOURCE-API:aic-clli": {
@@ -81517,6 +86469,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:dest-port": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configuration-request-input(config)dest-port"
@@ -82076,6 +87032,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:request-version": {
           "$ref": "#/definitions/Optional.empty",
           "description": "keep this?"
@@ -82223,6 +87183,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:request-version": {
           "$ref": "#/definitions/Optional.empty"
         },
@@ -82287,6 +87251,34 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API(config)vnf-vnr-rebuild-data": {
+      "properties": {
+        "GENERIC-RESOURCE-API:vnf-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:vnf-service-instance-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:vnrs-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/vnf-vnr-rebuild-data(config)vnrs-data"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API(config)vnf-vnr-rebuild-data-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:vnf-vnr-rebuild-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API(config)vnf-vnr-rebuild-data"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API(config)vnr-parameters": {
       "properties": {
         "GENERIC-RESOURCE-API:lower-tag-id": {
@@ -82311,6 +87303,10 @@
         "GENERIC-RESOURCE-API:upper-tag-id": {
           "$ref": "#/definitions/Optional.empty"
         },
+        "GENERIC-RESOURCE-API:vf-module-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "This is mandatory in case of rebuild"
+        },
         "GENERIC-RESOURCE-API:vnf-id": {
           "$ref": "#/definitions/Optional.empty"
         },
@@ -85387,6 +90383,25 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/gc-request-input(config)configuration-ids": {
+      "properties": {
+        "GENERIC-RESOURCE-API:configuration-id": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/gc-request-input(config)configuration-ids-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:configuration-ids": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/gc-request-input(config)configuration-ids"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/gc-request-input(config)input-parameters": {
       "properties": {
         "GENERIC-RESOURCE-API:param": {
@@ -85718,12 +90733,26 @@
     },
     "GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information(config)gc-request-input": {
       "properties": {
+        "GENERIC-RESOURCE-API:configuration-ids": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)configuration-ids"
+          },
+          "type": "array"
+        },
         "GENERIC-RESOURCE-API:input-parameters": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)input-parameters"
           },
           "type": "object"
         },
+        "GENERIC-RESOURCE-API:rebuild": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Value will indicate what to rebuild"
+        },
+        "GENERIC-RESOURCE-API:vf-module-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "This is mandatory in case of rebuild"
+        },
         "GENERIC-RESOURCE-API:vnf-id": {
           "$ref": "#/definitions/Optional.empty"
         }
@@ -85880,6 +90909,25 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)configuration-ids": {
+      "properties": {
+        "GENERIC-RESOURCE-API:configuration-id": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)configuration-ids-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:configuration-ids": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)configuration-ids"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/generic-configurations/gc-configuration/configuration-data/configuration-operation-information/gc-request-input(config)input-parameters": {
       "properties": {
         "GENERIC-RESOURCE-API:param": {
@@ -86222,6 +91270,142 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/pnf-details(config)onap-model-information": {
+      "properties": {
+        "GENERIC-RESOURCE-API:model-customization-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "customized resource for use within a given service.Would not be present at the service level but would be present for the resource level"
+        },
+        "GENERIC-RESOURCE-API:model-invariant-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "identifies the invariant uuid for this service or resource"
+        },
+        "GENERIC-RESOURCE-API:model-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:model-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "identifies the uuid for this service or resource, which is version specific"
+        },
+        "GENERIC-RESOURCE-API:model-version": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/pnf-details(config)onap-model-information-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:onap-model-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-details(config)onap-model-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/pnf-request-input(config)pnf-input-parameters": {
+      "properties": {
+        "GENERIC-RESOURCE-API:param": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters(config)param"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/pnf-request-input(config)pnf-input-parameters-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-input-parameters": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-request-input(config)pnf-input-parameters"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters(config)param": {
+      "properties": {
+        "GENERIC-RESOURCE-API:name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:resource-resolution-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:value": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters(config)param-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:param": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters(config)param"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data": {
+      "properties": {
+        "GENERIC-RESOURCE-API:capability-name": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Resource assignment resolution Capability name"
+        },
+        "GENERIC-RESOURCE-API:resource-key": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key"
+          },
+          "type": "array"
+        },
+        "GENERIC-RESOURCE-API:status": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "SUCCESS, FAILED, or PENDING - RA returned data as capability"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:resource-resolution-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key": {
+      "properties": {
+        "GENERIC-RESOURCE-API:name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:value": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:resource-key": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/port-mirror-configuration-request-input(config)dest-port": {
       "properties": {
         "GENERIC-RESOURCE-API:pnf-information": {
@@ -86931,6 +92115,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:dest-port": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/port-mirror-configurations/port-mirror-configuration/configuration-data/configuration-operation-information/port-mirror-configuration-request-input(config)dest-port"
@@ -88620,6 +93808,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:onap-model-information": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology(config)onap-model-information"
@@ -88773,6 +93965,12 @@
     },
     "GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology(config)vf-module-assignments": {
       "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignments": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments"
+          },
+          "type": "object"
+        },
         "GENERIC-RESOURCE-API:vf-module-status": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration status from AAI - to be set by SDNC"
@@ -88852,6 +94050,28 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments": {
+      "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignment": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignments": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)vlan-vnfc-instance-groups": {
       "properties": {
         "GENERIC-RESOURCE-API:vlan-vnfc-instance-group": {
@@ -88896,6 +94116,32 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment": {
+      "properties": {
+        "GENERIC-RESOURCE-API:ip-version": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:neutron-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Same as subnet-id in subnet-data structure"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignment": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/preload-information/preload-list/preload-data/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group": {
       "properties": {
         "GENERIC-RESOURCE-API:instance-group-function": {
@@ -89201,6 +94447,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "Assuming HEAT template network role tag parameter - not used"
         },
+        "GENERIC-RESOURCE-API:neutron-network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Neutron network id assigned by PO/RP"
+        },
         "GENERIC-RESOURCE-API:vlan-tag-id": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Vlan tag assigned to subinterface port"
@@ -89752,6 +95002,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "Assuming HEAT template network role tag parameter - not used"
         },
+        "GENERIC-RESOURCE-API:neutron-network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Neutron network id assigned by PO/RP"
+        },
         "GENERIC-RESOURCE-API:vlan-tag-id": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Vlan tag assigned to subinterface port"
@@ -91000,6 +96254,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:onap-model-information": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology(config)onap-model-information"
@@ -91153,6 +96411,12 @@
     },
     "GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology(config)vf-module-assignments": {
       "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignments": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments"
+          },
+          "type": "object"
+        },
         "GENERIC-RESOURCE-API:vf-module-status": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration status from AAI - to be set by SDNC"
@@ -91232,6 +96496,28 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments": {
+      "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignment": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignments": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments(config)vlan-vnfc-instance-groups": {
       "properties": {
         "GENERIC-RESOURCE-API:vlan-vnfc-instance-group": {
@@ -91276,6 +96562,32 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment": {
+      "properties": {
+        "GENERIC-RESOURCE-API:ip-version": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:neutron-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Same as subnet-id in subnet-data structure"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignment": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/preload-vf-module-topology-information/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group": {
       "properties": {
         "GENERIC-RESOURCE-API:instance-group-function": {
@@ -91581,6 +96893,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "Assuming HEAT template network role tag parameter - not used"
         },
+        "GENERIC-RESOURCE-API:neutron-network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Neutron network id assigned by PO/RP"
+        },
         "GENERIC-RESOURCE-API:vlan-tag-id": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Vlan tag assigned to subinterface port"
@@ -92132,6 +97448,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "Assuming HEAT template network role tag parameter - not used"
         },
+        "GENERIC-RESOURCE-API:neutron-network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Neutron network id assigned by PO/RP"
+        },
         "GENERIC-RESOURCE-API:vlan-tag-id": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Vlan tag assigned to subinterface port"
@@ -94282,6 +99602,12 @@
           },
           "type": "object"
         },
+        "GENERIC-RESOURCE-API:pnfs": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)pnfs"
+          },
+          "type": "object"
+        },
         "GENERIC-RESOURCE-API:provided-allotted-resources": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)provided-allotted-resources"
@@ -94486,6 +99812,28 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/services/service/service-data(config)pnfs": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data(config)pnfs-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnfs": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)pnfs"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/services/service/service-data(config)provided-allotted-resources": {
       "properties": {
         "GENERIC-RESOURCE-API:provided-allotted-resource": {
@@ -95064,6 +100412,18 @@
     },
     "GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups(config)network-instance-group": {
       "properties": {
+        "GENERIC-RESOURCE-API:aggregate-route-policy": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-route-policy"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:aggregate-routes": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-routes"
+          },
+          "type": "array"
+        },
         "GENERIC-RESOURCE-API:network-instance-group-function": {
           "$ref": "#/definitions/Optional.empty"
         },
@@ -95088,37 +100448,92 @@
         },
         "GENERIC-RESOURCE-API:subnet-assignment-policy": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)subnet-assignment-policy"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)subnet-assignment-policy"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:subnet-key-value": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "key-value provided to EIPAM when  creating shared subnet"
+        },
+        "GENERIC-RESOURCE-API:subnets": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)subnets"
+          },
+          "type": "array"
+        },
+        "GENERIC-RESOURCE-API:vpn-binding-policy": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)vpn-binding-policy"
+          },
+          "type": "object"
+        }
+      },
+      "required": [
+        "GENERIC-RESOURCE-API:network-instance-group-id"
+      ],
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups(config)network-instance-group-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:network-instance-group": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups(config)network-instance-group"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-route-policy": {
+      "properties": {
+        "GENERIC-RESOURCE-API:aggregate-route-policy-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:ipv4-aggregate-route-level": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:ipv6-aggregate-route-level": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-route-policy-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:aggregate-route-policy": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-route-policy"
           },
           "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-routes": {
+      "properties": {
+        "GENERIC-RESOURCE-API:cidr-mask": {
+          "$ref": "#/definitions/Optional.empty"
         },
-        "GENERIC-RESOURCE-API:subnet-key-value": {
+        "GENERIC-RESOURCE-API:ip-version": {
           "$ref": "#/definitions/Optional.empty",
-          "description": "key-value provided to EIPAM when  creating shared subnet"
+          "description": "Use values 4 or 6."
         },
-        "GENERIC-RESOURCE-API:subnets": {
-          "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)subnets"
-          },
-          "type": "array"
+        "GENERIC-RESOURCE-API:route-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique id"
         },
-        "GENERIC-RESOURCE-API:vpn-binding-policy": {
-          "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)vpn-binding-policy"
-          },
-          "type": "object"
+        "GENERIC-RESOURCE-API:start-address": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
-      "required": [
-        "GENERIC-RESOURCE-API:network-instance-group-id"
-      ],
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups(config)network-instance-group-TOP": {
+    "GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-routes-TOP": {
       "properties": {
-        "GENERIC-RESOURCE-API:network-instance-group": {
+        "GENERIC-RESOURCE-API:aggregate-routes": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups(config)network-instance-group"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-routes"
           },
           "type": "array"
         }
@@ -95301,6 +100716,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "assigned, unassigned"
         },
+        "GENERIC-RESOURCE-API:neutron-network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Neutron-network-id assigned by PO/RO"
+        },
         "GENERIC-RESOURCE-API:vlan-tag-id": {
           "$ref": "#/definitions/Optional.empty"
         },
@@ -95602,6 +101021,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:network-input-parameters": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-request-input(config)network-input-parameters"
@@ -95642,6 +101065,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:network-assignments": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)network-assignments"
@@ -96036,120 +101463,818 @@
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)onap-model-information-TOP": {
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)onap-model-information-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:onap-model-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)onap-model-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-parameters(config)network-parameter": {
+      "properties": {
+        "GENERIC-RESOURCE-API:network-parameter-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:network-parameter-value": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-parameters(config)network-parameter-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:network-parameter": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-parameters(config)network-parameter"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure(config)related-networks": {
+      "properties": {
+        "GENERIC-RESOURCE-API:related-network": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks(config)related-network"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure(config)related-networks-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:related-networks": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure(config)related-networks"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks(config)related-network": {
+      "properties": {
+        "GENERIC-RESOURCE-API:network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Key to l3-network object"
+        },
+        "GENERIC-RESOURCE-API:network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:vlan-tags": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network(config)vlan-tags"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks(config)related-network-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:related-network": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks(config)related-network"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network(config)vlan-tags": {
+      "properties": {
+        "GENERIC-RESOURCE-API:is-private": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:lower-tag-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:upper-tag-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:vlan-interface": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "A&AI Key"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network(config)vlan-tags-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:vlan-tags": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network(config)vlan-tags"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/service-information(config)onap-model-information": {
+      "properties": {
+        "GENERIC-RESOURCE-API:model-customization-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "customized resource for use within a given service.Would not be present at the service level but would be present for the resource level"
+        },
+        "GENERIC-RESOURCE-API:model-invariant-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "identifies the invariant uuid for this service or resource"
+        },
+        "GENERIC-RESOURCE-API:model-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:model-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "identifies the uuid for this service or resource, which is version specific"
+        },
+        "GENERIC-RESOURCE-API:model-version": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/service-information(config)onap-model-information-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:onap-model-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/service-information(config)onap-model-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf(config)pnf-data"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-id": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "required": [
+        "GENERIC-RESOURCE-API:pnf-id"
+      ],
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf(config)pnf-data": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-details": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-details"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-level-oper-status": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-level-oper-status"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-request-input": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-request-input"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-topology": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-topology"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:request-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)request-information"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:sdnc-request-header": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)sdnc-request-header"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:service-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)service-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf(config)pnf-data-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf(config)pnf-data"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-details": {
+      "properties": {
+        "GENERIC-RESOURCE-API:onap-model-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-details(config)onap-model-information"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "pnfId*Identifier of this Pnf information element. CORRELATIONID = PNF-NAME (A&AI)"
+        },
+        "GENERIC-RESOURCE-API:pnf-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:pnf-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "pnfType (template)*Type of Resource. NEW type: PNF (pre-defined in SDC)"
+        }
+      },
+      "required": [
+        "GENERIC-RESOURCE-API:pnf-id"
+      ],
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-details-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-details": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-details"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-level-oper-status": {
+      "properties": {
+        "GENERIC-RESOURCE-API:create-timestamp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Not currently populated in service data."
+        },
+        "GENERIC-RESOURCE-API:last-action": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "should be list of possible request-actions"
+        },
+        "GENERIC-RESOURCE-API:last-order-status": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:last-rpc-action": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:last-svc-request-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Not currently populated in service data."
+        },
+        "GENERIC-RESOURCE-API:modify-timestamp": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:order-status": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "TBD - do we need Request failed statuses? RequestFailed | InProgressTimeout"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-level-oper-status-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-level-oper-status": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-level-oper-status"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-request-input": {
+      "properties": {
+        "GENERIC-RESOURCE-API:aic-clli": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Not expected to be used"
+        },
+        "GENERIC-RESOURCE-API:aic-cloud-region": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The AIC cloud region which maps to contrail versions"
+        },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
+        "GENERIC-RESOURCE-API:pnf-input-parameters": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:request-version": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "keep this? e.g. 1702"
+        },
+        "GENERIC-RESOURCE-API:tenant": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-request-input-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-request-input": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-request-input"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-topology": {
+      "properties": {
+        "GENERIC-RESOURCE-API:aic-clli": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Not expected to be used"
+        },
+        "GENERIC-RESOURCE-API:aic-cloud-region": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The AIC cloud region which maps to contrail versions"
+        },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
+        "GENERIC-RESOURCE-API:onap-model-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)onap-model-information"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-parameters-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:pnf-topology-identifier-structure": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-topology-identifier-structure"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:sdnc-generated-cloud-resources": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicate if source is sdnc generated cloud param.When true, the parameters are literal HEAT template parameter names;When false, the parameters need to be converted to HEAT format"
+        },
+        "GENERIC-RESOURCE-API:tenant": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-topology-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-topology": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-topology"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)request-information": {
+      "properties": {
+        "GENERIC-RESOURCE-API:notification-url": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:order-number": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:order-version": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:request-action": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "still need to work Disconnect"
+        },
+        "GENERIC-RESOURCE-API:request-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Request ID generated upstream of MSO"
+        },
+        "GENERIC-RESOURCE-API:source": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)request-information-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:request-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)request-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)sdnc-request-header": {
+      "properties": {
+        "GENERIC-RESOURCE-API:svc-action": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "This is the rpcAction"
+        },
+        "GENERIC-RESOURCE-API:svc-notification-url": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Contains URL for asynchronous response"
+        },
+        "GENERIC-RESOURCE-API:svc-request-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Uniquely generated by calling system (e.g. MSO or SDN-GP)"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)sdnc-request-header-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:sdnc-request-header": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)sdnc-request-header"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)service-information": {
+      "properties": {
+        "GENERIC-RESOURCE-API:global-customer-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "need for put of data to AnAI (MSO provides)"
+        },
+        "GENERIC-RESOURCE-API:onap-model-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/service-information(config)onap-model-information"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:service-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "This maps to the product-family-id in A&AI"
+        },
+        "GENERIC-RESOURCE-API:service-instance-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:subscriber-name": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Would not be expected for vIPR-ATM or mobility services."
+        },
+        "GENERIC-RESOURCE-API:subscription-service-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "used to reference a&ai subscription-service-type. For example, we show as vIPR-ATM in example."
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)service-information-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:service-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)service-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-details(config)onap-model-information": {
+      "properties": {
+        "GENERIC-RESOURCE-API:model-customization-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "customized resource for use within a given service.Would not be present at the service level but would be present for the resource level"
+        },
+        "GENERIC-RESOURCE-API:model-invariant-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "identifies the invariant uuid for this service or resource"
+        },
+        "GENERIC-RESOURCE-API:model-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:model-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "identifies the uuid for this service or resource, which is version specific"
+        },
+        "GENERIC-RESOURCE-API:model-version": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-details(config)onap-model-information-TOP": {
       "properties": {
         "GENERIC-RESOURCE-API:onap-model-information": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology(config)onap-model-information"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-details(config)onap-model-information"
           },
           "type": "object"
         }
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-parameters(config)network-parameter": {
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters": {
       "properties": {
-        "GENERIC-RESOURCE-API:network-parameter-name": {
+        "GENERIC-RESOURCE-API:param": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters(config)param"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-input-parameters": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters(config)param": {
+      "properties": {
+        "GENERIC-RESOURCE-API:name": {
           "$ref": "#/definitions/Optional.empty"
         },
-        "GENERIC-RESOURCE-API:network-parameter-value": {
+        "GENERIC-RESOURCE-API:resource-resolution-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:value": {
           "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-parameters(config)network-parameter-TOP": {
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters(config)param-TOP": {
       "properties": {
-        "GENERIC-RESOURCE-API:network-parameter": {
+        "GENERIC-RESOURCE-API:param": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-parameters(config)network-parameter"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters(config)param"
           },
           "type": "array"
         }
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure(config)related-networks": {
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data": {
       "properties": {
-        "GENERIC-RESOURCE-API:related-network": {
+        "GENERIC-RESOURCE-API:capability-name": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Resource assignment resolution Capability name"
+        },
+        "GENERIC-RESOURCE-API:resource-key": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks(config)related-network"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key"
           },
           "type": "array"
+        },
+        "GENERIC-RESOURCE-API:status": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "SUCCESS, FAILED, or PENDING - RA returned data as capability"
         }
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure(config)related-networks-TOP": {
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data-TOP": {
       "properties": {
-        "GENERIC-RESOURCE-API:related-networks": {
+        "GENERIC-RESOURCE-API:resource-resolution-data": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure(config)related-networks"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param(config)resource-resolution-data"
           },
           "type": "object"
         }
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks(config)related-network": {
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key": {
       "properties": {
-        "GENERIC-RESOURCE-API:network-id": {
+        "GENERIC-RESOURCE-API:name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:value": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:resource-key": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters/param/resource-resolution-data(config)resource-key"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)onap-model-information": {
+      "properties": {
+        "GENERIC-RESOURCE-API:model-customization-uuid": {
           "$ref": "#/definitions/Optional.empty",
-          "description": "Key to l3-network object"
+          "description": "customized resource for use within a given service.Would not be present at the service level but would be present for the resource level"
         },
-        "GENERIC-RESOURCE-API:network-role": {
+        "GENERIC-RESOURCE-API:model-invariant-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "identifies the invariant uuid for this service or resource"
+        },
+        "GENERIC-RESOURCE-API:model-name": {
           "$ref": "#/definitions/Optional.empty"
         },
-        "GENERIC-RESOURCE-API:vlan-tags": {
+        "GENERIC-RESOURCE-API:model-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "identifies the uuid for this service or resource, which is version specific"
+        },
+        "GENERIC-RESOURCE-API:model-version": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)onap-model-information-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:onap-model-information": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network(config)vlan-tags"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)onap-model-information"
           },
           "type": "object"
         }
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks(config)related-network-TOP": {
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data": {
       "properties": {
-        "GENERIC-RESOURCE-API:related-network": {
+        "GENERIC-RESOURCE-API:param": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks(config)related-network"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param"
           },
           "type": "array"
         }
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network(config)vlan-tags": {
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data-TOP": {
       "properties": {
-        "GENERIC-RESOURCE-API:is-private": {
+        "GENERIC-RESOURCE-API:pnf-parameters-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-topology-identifier-structure": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-id": {
           "$ref": "#/definitions/Optional.empty"
         },
-        "GENERIC-RESOURCE-API:lower-tag-id": {
+        "GENERIC-RESOURCE-API:pnf-name": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "optionally comes from pnf-request-input container or is assigned by sdn-c"
+        },
+        "GENERIC-RESOURCE-API:pnf-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "In preload tree, this label is used for the vf-module-type"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-topology-identifier-structure-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:pnf-topology-identifier-structure": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-topology-identifier-structure"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param": {
+      "properties": {
+        "GENERIC-RESOURCE-API:name": {
           "$ref": "#/definitions/Optional.empty"
         },
-        "GENERIC-RESOURCE-API:upper-tag-id": {
+        "GENERIC-RESOURCE-API:resource-resolution-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param(config)resource-resolution-data"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:value": {
           "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:param": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param(config)resource-resolution-data": {
+      "properties": {
+        "GENERIC-RESOURCE-API:capability-name": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Resource assignment resolution Capability name"
         },
-        "GENERIC-RESOURCE-API:vlan-interface": {
+        "GENERIC-RESOURCE-API:resource-key": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param/resource-resolution-data(config)resource-key"
+          },
+          "type": "array"
+        },
+        "GENERIC-RESOURCE-API:status": {
           "$ref": "#/definitions/Optional.empty",
-          "description": "A&AI Key"
+          "description": "SUCCESS, FAILED, or PENDING - RA returned data as capability"
         }
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network(config)vlan-tags-TOP": {
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param(config)resource-resolution-data-TOP": {
       "properties": {
-        "GENERIC-RESOURCE-API:vlan-tags": {
+        "GENERIC-RESOURCE-API:resource-resolution-data": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/network-topology/network-topology-identifier-structure/related-networks/related-network(config)vlan-tags"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param(config)resource-resolution-data"
           },
           "type": "object"
         }
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/service-information(config)onap-model-information": {
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param/resource-resolution-data(config)resource-key": {
+      "properties": {
+        "GENERIC-RESOURCE-API:name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:value": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param/resource-resolution-data(config)resource-key-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:resource-key": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param/resource-resolution-data(config)resource-key"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/service-information(config)onap-model-information": {
       "properties": {
         "GENERIC-RESOURCE-API:model-customization-uuid": {
           "$ref": "#/definitions/Optional.empty",
@@ -96172,11 +102297,11 @@
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/service-information(config)onap-model-information-TOP": {
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/service-information(config)onap-model-information-TOP": {
       "properties": {
         "GENERIC-RESOURCE-API:onap-model-information": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/networks/network/network-data/service-information(config)onap-model-information"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/service-information(config)onap-model-information"
           },
           "type": "object"
         }
@@ -97138,6 +103263,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:request-version": {
           "$ref": "#/definitions/Optional.empty"
         },
@@ -97211,6 +103340,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:onap-model-information": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-topology(config)onap-model-information"
@@ -97640,6 +103773,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:request-version": {
           "$ref": "#/definitions/Optional.empty",
           "description": "keep this?"
@@ -97680,6 +103817,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
+        "GENERIC-RESOURCE-API:cloud-owner": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The cloud owner provided by the caller"
+        },
         "GENERIC-RESOURCE-API:onap-model-information": {
           "items": {
             "$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"
@@ -97813,155 +103954,161 @@
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-information(config)onap-model-information-TOP": {
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-information(config)onap-model-information-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:onap-model-information": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-information(config)onap-model-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input(config)vf-module-input-parameters": {
+      "properties": {
+        "GENERIC-RESOURCE-API:param": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input(config)vf-module-input-parameters-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:vf-module-input-parameters": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input(config)vf-module-input-parameters"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param": {
+      "properties": {
+        "GENERIC-RESOURCE-API:name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:resource-resolution-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data"
+          },
+          "type": "object"
+        },
+        "GENERIC-RESOURCE-API:value": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:param": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data": {
+      "properties": {
+        "GENERIC-RESOURCE-API:capability-name": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Resource assignment resolution Capability name"
+        },
+        "GENERIC-RESOURCE-API:resource-key": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key"
+          },
+          "type": "array"
+        },
+        "GENERIC-RESOURCE-API:status": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "SUCCESS, FAILED, or PENDING - RA returned data as capability"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:resource-resolution-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key": {
+      "properties": {
+        "GENERIC-RESOURCE-API:name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:value": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:resource-key": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "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": {
+      "properties": {
+        "GENERIC-RESOURCE-API:model-customization-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "customized resource for use within a given service.Would not be present at the service level but would be present for the resource level"
+        },
+        "GENERIC-RESOURCE-API:model-invariant-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "identifies the invariant uuid for this service or resource"
+        },
+        "GENERIC-RESOURCE-API:model-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:model-uuid": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "identifies the uuid for this service or resource, which is version specific"
+        },
+        "GENERIC-RESOURCE-API:model-version": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "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": {
       "properties": {
         "GENERIC-RESOURCE-API:onap-model-information": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-information(config)onap-model-information"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input(config)vf-module-input-parameters": {
-      "properties": {
-        "GENERIC-RESOURCE-API:param": {
-          "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param"
-          },
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input(config)vf-module-input-parameters-TOP": {
-      "properties": {
-        "GENERIC-RESOURCE-API:vf-module-input-parameters": {
-          "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input(config)vf-module-input-parameters"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param": {
-      "properties": {
-        "GENERIC-RESOURCE-API:name": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "GENERIC-RESOURCE-API:resource-resolution-data": {
-          "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data"
+            "$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"
           },
           "type": "object"
-        },
-        "GENERIC-RESOURCE-API:value": {
-          "$ref": "#/definitions/Optional.empty"
-        }
-      },
-      "type": "object"
-    },
-    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param-TOP": {
-      "properties": {
-        "GENERIC-RESOURCE-API:param": {
-          "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters(config)param"
-          },
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data": {
-      "properties": {
-        "GENERIC-RESOURCE-API:capability-name": {
-          "$ref": "#/definitions/Optional.empty",
-          "description": "Resource assignment resolution Capability name"
-        },
-        "GENERIC-RESOURCE-API:resource-key": {
-          "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key"
-          },
-          "type": "array"
-        },
-        "GENERIC-RESOURCE-API:status": {
-          "$ref": "#/definitions/Optional.empty",
-          "description": "SUCCESS, FAILED, or PENDING - RA returned data as capability"
         }
       },
       "type": "object"
     },
-    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data-TOP": {
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology(config)vf-module-assignments": {
       "properties": {
-        "GENERIC-RESOURCE-API:resource-resolution-data": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignments": {
           "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param(config)resource-resolution-data"
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments"
           },
           "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key": {
-      "properties": {
-        "GENERIC-RESOURCE-API:name": {
-          "$ref": "#/definitions/Optional.empty"
         },
-        "GENERIC-RESOURCE-API:value": {
-          "$ref": "#/definitions/Optional.empty"
-        }
-      },
-      "type": "object"
-    },
-    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key-TOP": {
-      "properties": {
-        "GENERIC-RESOURCE-API:resource-key": {
-          "items": {
-            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-request-input/vf-module-input-parameters/param/resource-resolution-data(config)resource-key"
-          },
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "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": {
-      "properties": {
-        "GENERIC-RESOURCE-API:model-customization-uuid": {
-          "$ref": "#/definitions/Optional.empty",
-          "description": "customized resource for use within a given service.Would not be present at the service level but would be present for the resource level"
-        },
-        "GENERIC-RESOURCE-API:model-invariant-uuid": {
-          "$ref": "#/definitions/Optional.empty",
-          "description": "identifies the invariant uuid for this service or resource"
-        },
-        "GENERIC-RESOURCE-API:model-name": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "GENERIC-RESOURCE-API:model-uuid": {
-          "$ref": "#/definitions/Optional.empty",
-          "description": "identifies the uuid for this service or resource, which is version specific"
-        },
-        "GENERIC-RESOURCE-API:model-version": {
-          "$ref": "#/definitions/Optional.empty"
-        }
-      },
-      "type": "object"
-    },
-    "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": {
-      "properties": {
-        "GENERIC-RESOURCE-API:onap-model-information": {
-          "items": {
-            "$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"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology(config)vf-module-assignments": {
-      "properties": {
         "GENERIC-RESOURCE-API:vf-module-status": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration status from AAI - to be set by SDNC"
@@ -98041,6 +104188,28 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments": {
+      "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignment": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignments": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)dhcp-subnet-assignments"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments(config)vlan-vnfc-instance-groups": {
       "properties": {
         "GENERIC-RESOURCE-API:vlan-vnfc-instance-group": {
@@ -98085,6 +104254,32 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment": {
+      "properties": {
+        "GENERIC-RESOURCE-API:ip-version": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:neutron-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Same as subnet-id in subnet-data structure"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:dhcp-subnet-assignment": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data/vf-module-topology/vf-module-assignments/vlan-vnfc-instance-groups(config)vlan-vnfc-instance-group": {
       "properties": {
         "GENERIC-RESOURCE-API:instance-group-function": {
@@ -98390,6 +104585,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "Assuming HEAT template network role tag parameter - not used"
         },
+        "GENERIC-RESOURCE-API:neutron-network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Neutron network id assigned by PO/RP"
+        },
         "GENERIC-RESOURCE-API:vlan-tag-id": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Vlan tag assigned to subinterface port"
@@ -98941,6 +105140,10 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "Assuming HEAT template network role tag parameter - not used"
         },
+        "GENERIC-RESOURCE-API:neutron-network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Neutron network id assigned by PO/RP"
+        },
         "GENERIC-RESOURCE-API:vlan-tag-id": {
           "$ref": "#/definitions/Optional.empty",
           "description": "Vlan tag assigned to subinterface port"
@@ -99723,6 +105926,12 @@
           "$ref": "#/definitions/Optional.empty",
           "description": "Network Instance-Group id in A&AI"
         },
+        "GENERIC-RESOURCE-API:networks": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)networks"
+          },
+          "type": "object"
+        },
         "GENERIC-RESOURCE-API:vnf-floating-ip": {
           "items": {
             "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)vnf-floating-ip"
@@ -99746,6 +105955,28 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)networks": {
+      "properties": {
+        "GENERIC-RESOURCE-API:network": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection/networks(config)network"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)networks-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:networks": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)networks"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)vnf-floating-ip": {
       "properties": {
         "GENERIC-RESOURCE-API:ip-addresses": {
@@ -99768,6 +105999,33 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection/networks(config)network": {
+      "properties": {
+        "GENERIC-RESOURCE-API:network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Index into network-topology-identifier structure"
+        },
+        "GENERIC-RESOURCE-API:neutron-network-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Neutron-network-id assigned by PO/RO"
+        }
+      },
+      "required": [
+        "GENERIC-RESOURCE-API:network-id"
+      ],
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection/networks(config)network-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:network": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection/networks(config)network"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection/vnf-floating-ip(config)ip-addresses": {
       "properties": {
         "GENERIC-RESOURCE-API:ipv4-address": {
@@ -102505,6 +108763,46 @@
       },
       "type": "object"
     },
+    "GENERIC-RESOURCE-API/vnf-vnr-rebuild-data(config)vnrs-data": {
+      "properties": {
+        "GENERIC-RESOURCE-API:configuration-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:lower-tag-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:network-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:network-instance-group-function": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:network-instance-group-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:parent-port-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:upper-tag-id": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "GENERIC-RESOURCE-API:vnfc-instance-group-function": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/vnf-vnr-rebuild-data(config)vnrs-data-TOP": {
+      "properties": {
+        "GENERIC-RESOURCE-API:vnrs-data": {
+          "items": {
+            "$ref": "#/definitions/GENERIC-RESOURCE-API/vnf-vnr-rebuild-data(config)vnrs-data"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "unique_empty_identifier": {}
   }
 }
SDNC northbound adaptors