Update GENERIC-RESOURCE-API swagger

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>
author: Dan Timoney <dtimoney@att.com> 2020-01-22 12:29:21 -0500
committer: Dan Timoney <dtimoney@att.com> 2020-01-22 12:29:21 -0500
commit: 2706e94c5116b1de370e482a31b2ad1d610df774 (patch)
tree: 3f047999db27ba1995a6ea8d8089d14dc7870fc0 /generic-resource-api/model/src
parent: 8c8634e2b272a625bf7434e428c85ac91793c068 (diff)
1 files changed, 6952 insertions, 654 deletions
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 3a49b93a..f70665fa 100644
--- 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,105 @@
         "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",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-configuration-ids"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-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)configuration-ids"
+            }
+          }
+        },
+        "operationId": "GET-configuration-ids"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "configuration-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "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": {
+          "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)configuration-ids-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-configuration-ids"
+      }
+    },
+    "/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",
@@ -10145,7 +10251,7 @@
         "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}": {
+    "/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",
@@ -10284,7 +10390,7 @@
         "operationId": "PUT-param"
       }
     },
-    "/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}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -10423,7 +10529,7 @@
         "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}": {
+    "/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",
@@ -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",
@@ -16428,14 +16534,6 @@
           },
           {
             "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",
             "required": false,
             "schema": {
@@ -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",
@@ -18369,6 +18475,14 @@
           },
           {
             "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",
             "required": false,
             "schema": {
@@ -18430,7 +18544,279 @@
         "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",
+          "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-dhcp-subnet-assignments"
+      },
+      "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)dhcp-subnet-assignments"
+            }
+          }
+        },
+        "operationId": "GET-dhcp-subnet-assignments"
+      },
+      "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"
+          },
+          {
+            "in": "body",
+            "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/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)dhcp-subnet-assignmentsPOST"
+            }
+          }
+        },
+        "operationId": "POST-dhcp-subnet-assignments"
+      },
+      "put": {
+        "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"
+          },
+          {
+            "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"
+            }
+          }
+        ],
+        "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(config)dhcp-subnet-assignments-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-dhcp-subnet-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/dhcp-subnet-assignments/dhcp-subnet-assignment/{neutron-subnet-id}": {
+      "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": "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"
+          }
+        },
+        "operationId": "DELETE-dhcp-subnet-assignment"
+      },
+      "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": "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)dhcp-subnet-assignment"
+            }
+          }
+        },
+        "operationId": "GET-dhcp-subnet-assignment"
+      },
+      "put": {
+        "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": "Same as subnet-id in subnet-data structure",
+            "in": "path",
+            "name": "neutron-subnet-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "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/dhcp-subnet-assignments(config)dhcp-subnet-assignment-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/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP"
+            }
+          }
+        },
+        "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",
@@ -18577,7 +18963,7 @@
         "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}": {
+    "/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",
@@ -18752,7 +19138,7 @@
         "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": {
+    "/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",
@@ -18927,7 +19313,7 @@
         "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}": {
+    "/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",
@@ -19126,7 +19512,7 @@
         "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": {
+    "/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",
@@ -19325,7 +19711,7 @@
         "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}": {
+    "/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",
@@ -19560,7 +19946,7 @@
         "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": {
+    "/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",
@@ -19787,7 +20173,7 @@
         "operationId": "PUT-vlan-common-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-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/ip-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -19951,7 +20337,7 @@
         "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": {
+    "/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",
@@ -20178,7 +20564,7 @@
         "operationId": "PUT-vlan-vnics"
       }
     },
-    "/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/vlan-vnic/{vnic-port-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -20429,7 +20815,7 @@
         "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": {
+    "/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",
@@ -20680,7 +21066,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/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: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",
@@ -20967,7 +21353,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/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": {
+    "/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",
@@ -21170,7 +21556,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/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}/network-information-items": {
       "delete": {
         "produces": [
           "application/json",
@@ -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",
@@ -35015,6 +35401,14 @@
           },
           {
             "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",
             "required": false,
             "schema": {
@@ -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",
@@ -37110,6 +37504,14 @@
           },
           {
             "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",
             "required": false,
             "schema": {
@@ -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,236 @@
         "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",
+          "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"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-aggregate-route-policy"
+      },
+      "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"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)aggregate-route-policy"
+            }
+          }
+        },
+        "operationId": "GET-aggregate-route-policy"
+      },
+      "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)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"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-route-policy-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-aggregate-route-policy"
+      }
+    },
+    "/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",
+          "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": "Unique id",
+            "in": "path",
+            "name": "route-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-aggregate-routes"
+      },
+      "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": "Unique id",
+            "in": "path",
+            "name": "route-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)aggregate-routes"
+            }
+          }
+        },
+        "operationId": "GET-aggregate-routes"
+      },
+      "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": "Unique id",
+            "in": "path",
+            "name": "route-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "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": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-routes-TOP"
+            }
+          }
+        },
+        "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",
@@ -37334,7 +37973,7 @@
         "operationId": "PUT-networks"
       }
     },
-    "/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}/networks/network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -37517,7 +38156,7 @@
         "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": {
+    "/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",
@@ -37692,7 +38331,7 @@
         "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}": {
+    "/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",
@@ -37838,7 +38477,7 @@
         "operationId": "PUT-customer-bonding-request"
       }
     },
-    "/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}/vpn-bindings/{vpn-binding-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -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,2983 @@
         "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",
+          "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-pnfs"
+      },
+      "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)pnfs"
+            }
+          }
+        },
+        "operationId": "GET-pnfs"
+      },
+      "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)pnf",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)pnfsPOST"
+            }
+          }
+        },
+        "operationId": "POST-pnfs"
+      },
+      "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)pnfs",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)pnfs-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data(config)pnfs-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-pnfs"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-pnf"
+      },
+      "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"
+            }
+          }
+        },
+        "operationId": "GET-pnf"
+      },
+      "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)pnf-data",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf(config)pnf-data-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)pnfPOST"
+            }
+          }
+        },
+        "operationId": "POST-pnf"
+      },
+      "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",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs(config)pnf-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-pnf"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-pnf-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)pnf-data"
+            }
+          }
+        },
+        "operationId": "GET-pnf-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)pnf-topology",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-topology-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)pnf-level-oper-status",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-level-oper-status-TOP"
+            }
+          },
+          {
+            "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"
+            }
+          },
+          {
+            "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"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)pnf-request-input",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-request-input-TOP"
+            }
+          },
+          {
+            "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"
+            }
+          },
+          {
+            "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)pnf-dataPOST"
+            }
+          }
+        },
+        "operationId": "POST-pnf-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)pnf-data",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf(config)pnf-data-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf(config)pnf-data-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-pnf-data"
+      }
+    },
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/pnf-data/pnf-details": {
+      "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-details"
+      },
+      "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-details"
+            }
+          }
+        },
+        "operationId": "GET-pnf-details"
+      },
+      "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/pnf-details(config)onap-model-information-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)pnf-detailsPOST"
+            }
+          }
+        },
+        "operationId": "POST-pnf-details"
+      },
+      "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-details",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-details-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-details-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-pnf-details"
+      }
+    },
+    "/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",
+          "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/pnf-details(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/pnf-details(config)onap-model-information-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-onap-model-information"
+      }
+    },
+    "/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",
+          "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-level-oper-status"
+      },
+      "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-level-oper-status"
+            }
+          }
+        },
+        "operationId": "GET-pnf-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": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)pnf-level-oper-status",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-level-oper-status-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-level-oper-status-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-pnf-level-oper-status"
+      }
+    },
+    "/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",
+          "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-request-input"
+      },
+      "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-request-input"
+            }
+          }
+        },
+        "operationId": "GET-pnf-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)pnf-input-parameters",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)pnf-request-inputPOST"
+            }
+          }
+        },
+        "operationId": "POST-pnf-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": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)pnf-request-input",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-request-input-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-request-input-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-pnf-request-input"
+      }
+    },
+    "/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",
+          "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-input-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)pnf-input-parameters"
+            }
+          }
+        },
+        "operationId": "GET-pnf-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)param",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters(config)param-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)pnf-input-parametersPOST"
+            }
+          }
+        },
+        "operationId": "POST-pnf-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": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)pnf-input-parameters",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-pnf-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/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": "pnf-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": "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)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": "pnf-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/pnfs/pnf/pnf-data/pnf-request-input/pnf-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": "pnf-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/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters(config)param-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$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"
+      }
+    },
+    "/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",
+          "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": "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": "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)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": "pnf-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/pnfs/pnf/pnf-data/pnf-request-input/pnf-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": "pnf-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/pnfs/pnf/pnf-data/pnf-request-input/pnf-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/pnfs/pnf/pnf-data/pnf-request-input/pnf-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/pnfs/pnf/{pnf-id}/pnf-data/pnf-request-input/pnf-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": "pnf-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": "pnf-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": "pnf-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/pnfs/pnf/pnf-data/pnf-request-input/pnf-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/pnfs/pnf/pnf-data/pnf-request-input/pnf-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/pnfs/pnf/{pnf-id}/pnf-data/pnf-topology": {
+      "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"
+      },
+      "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"
+            }
+          }
+        },
+        "operationId": "GET-pnf-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": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)pnf-parameters-data",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data-TOP"
+            }
+          },
+          {
+            "in": "body",
+            "name": "**(config)onap-model-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)onap-model-information-TOP"
+            }
+          },
+          {
+            "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/(config)pnf-topologyPOST"
+            }
+          }
+        },
+        "operationId": "POST-pnf-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": "path",
+            "name": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)pnf-topology",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-topology-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data(config)pnf-topology-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-pnf-topology"
+      }
+    },
+    "/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",
+          "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/pnf-topology(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/pnf-topology(config)onap-model-information-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-onap-model-information"
+      }
+    },
+    "/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",
+          "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-parameters-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)pnf-parameters-data"
+            }
+          }
+        },
+        "operationId": "GET-pnf-parameters-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)param",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)pnf-parameters-dataPOST"
+            }
+          }
+        },
+        "operationId": "POST-pnf-parameters-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": "pnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)pnf-parameters-data",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data-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-parameters-data-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-pnf-parameters-data"
+      }
+    },
+    "/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",
+          "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": "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": "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)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": "pnf-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/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/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": "pnf-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/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data(config)param-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-param"
+      }
+    },
+    "/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",
+          "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": "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": "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)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": "pnf-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/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/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": "pnf-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/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param(config)resource-resolution-data-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$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-resource-resolution-data"
+      }
+    },
+    "/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",
+          "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": "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": "pnf-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": "pnf-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/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/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/pnfs/pnf/pnf-data/pnf-topology/pnf-parameters-data/param/resource-resolution-data(config)resource-key-TOP"
+            }
+          }
+        },
+        "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",
@@ -41854,7 +45469,7 @@
         "operationId": "PUT-provided-allotted-resources"
       }
     },
-    "/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/provided-allotted-resources/provided-allotted-resource/{allotted-resource-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -41955,7 +45570,7 @@
         "operationId": "PUT-provided-allotted-resource"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-configurations": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-configurations": {
       "delete": {
         "produces": [
           "application/json",
@@ -42074,7 +45689,7 @@
         "operationId": "PUT-provided-configurations"
       }
     },
-    "/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/provided-configurations/provided-configuration/{configuration-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -42175,7 +45790,7 @@
         "operationId": "PUT-provided-configuration"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/request-information": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/request-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -42258,7 +45873,7 @@
         "operationId": "PUT-request-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/sdnc-request-header": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -42341,7 +45956,7 @@
         "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/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/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -42460,7 +46075,7 @@
         "operationId": "PUT-service-information"
       }
     },
-    "/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/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -42543,7 +46158,7 @@
         "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/service-level-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -42626,7 +46241,7 @@
         "operationId": "PUT-service-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/service-request-input": {
       "delete": {
         "produces": [
           "application/json",
@@ -42745,7 +46360,7 @@
         "operationId": "PUT-service-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/service-request-input/service-input-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -42864,7 +46479,7 @@
         "operationId": "PUT-service-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/service-request-input/service-input-parameters/param/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -43007,7 +46622,7 @@
         "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/service-request-input/service-input-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -43150,7 +46765,7 @@
         "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/service-request-input/service-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -43269,7 +46884,7 @@
         "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/service-topology": {
       "delete": {
         "produces": [
           "application/json",
@@ -43334,10 +46949,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)service-topology-identifier",
+            "name": "**(config)service-parameters",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-topology-identifier-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-parameters-TOP"
             }
           },
           {
@@ -43358,10 +46973,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)service-parameters",
+            "name": "**(config)service-topology-identifier",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-parameters-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/service-topology(config)service-topology-identifier-TOP"
             }
           }
         ],
@@ -43412,7 +47027,7 @@
         "operationId": "PUT-service-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/service-topology/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -43495,7 +47110,7 @@
         "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/service-topology/service-assignments": {
       "delete": {
         "produces": [
           "application/json",
@@ -43578,7 +47193,7 @@
         "operationId": "PUT-service-assignments"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-parameters": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-parameters": {
       "delete": {
         "produces": [
           "application/json",
@@ -43697,7 +47312,7 @@
         "operationId": "PUT-service-parameters"
       }
     },
-    "/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/service-topology/service-parameters/service-parameter/{service-parameter-name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -43798,7 +47413,7 @@
         "operationId": "PUT-service-parameter"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-topology-identifier": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/service-topology/service-topology-identifier": {
       "delete": {
         "produces": [
           "application/json",
@@ -43881,7 +47496,7 @@
         "operationId": "PUT-service-topology-identifier"
       }
     },
-    "/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/vnfc-instance-groups": {
       "delete": {
         "produces": [
           "application/json",
@@ -44000,7 +47615,7 @@
         "operationId": "PUT-vnfc-instance-groups"
       }
     },
-    "/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/vnfc-instance-groups/vnfc-instance-group/{instance-group-role}/{nfc-naming-code}/{configuration-id}": {
       "delete": {
         "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",
@@ -46348,7 +49963,7 @@
         "operationId": "PUT-license-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/license-information/entitlement-pool-list/{entitlement-pool-uuid}/{action}": {
       "delete": {
         "produces": [
           "application/json",
@@ -46485,7 +50100,7 @@
         "operationId": "PUT-entitlement-pool-list"
       }
     },
-    "/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/license-information/license-key-group-list/{license-key-group-uuid}/{action}": {
       "delete": {
         "produces": [
           "application/json",
@@ -46622,7 +50237,7 @@
         "operationId": "PUT-license-key-group-list"
       }
     },
-    "/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/request-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -46723,7 +50338,7 @@
         "operationId": "PUT-request-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/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -46824,7 +50439,7 @@
         "operationId": "PUT-sdnc-request-header"
       }
     },
-    "/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/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -46967,7 +50582,7 @@
         "operationId": "PUT-service-information"
       }
     },
-    "/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/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -47068,7 +50683,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules": {
+    "/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules": {
       "delete": {
         "produces": [
           "application/json",
@@ -47211,7 +50826,7 @@
         "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}": {
+    "/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",
@@ -47378,7 +50993,7 @@
         "operationId": "PUT-vf-module"
       }
     },
-    "/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -47487,34 +51102,34 @@
           },
           {
             "in": "body",
-            "name": "**(config)sdnc-request-header",
+            "name": "**(config)request-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)sdnc-request-header-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)request-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)request-information",
+            "name": "**(config)sdnc-request-header",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)request-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)sdnc-request-header-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)vf-module-request-input",
+            "name": "**(config)vf-module-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-request-input-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)vf-module-information",
+            "name": "**(config)vnf-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vnf-information-TOP"
             }
           },
           {
@@ -47527,10 +51142,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)vnf-information",
+            "name": "**(config)vf-module-request-input",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vnf-information-TOP"
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vf-modules/vf-module/vf-module-data(config)vf-module-request-input-TOP"
             }
           },
           {
@@ -47601,7 +51216,7 @@
         "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": {
+    "/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",
@@ -47720,7 +51335,7 @@
         "operationId": "PUT-request-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/sdnc-request-header": {
       "delete": {
         "produces": [
           "application/json",
@@ -47839,7 +51454,7 @@
         "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/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/service-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -48006,7 +51621,7 @@
         "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/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/service-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -48125,7 +51740,7 @@
         "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-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -48292,7 +51907,7 @@
         "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": {
+    "/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",
@@ -48411,7 +52026,7 @@
         "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-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-level-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -48530,7 +52145,7 @@
         "operationId": "PUT-vf-module-level-oper-status"
       }
     },
-    "/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -48697,7 +52312,7 @@
         "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": {
+    "/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",
@@ -48864,7 +52479,7 @@
         "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/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -49055,7 +52670,7 @@
         "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": {
+    "/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",
@@ -49246,7 +52861,7 @@
         "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}/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-request-input/vf-module-input-parameters/param/{name}/resource-resolution-data/resource-key/{name}": {
       "delete": {
         "produces": [
           "application/json",
@@ -49401,7 +53016,7 @@
         "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": {
+    "/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",
@@ -49592,7 +53207,7 @@
         "operationId": "PUT-vf-module-topology"
       }
     },
-    "/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/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -49711,7 +53326,7 @@
         "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": {
+    "/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",
@@ -49820,6 +53435,14 @@
           },
           {
             "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": {
@@ -49886,7 +53509,314 @@
         "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/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/dhcp-subnet-assignments": {
+      "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-dhcp-subnet-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": "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)dhcp-subnet-assignments"
+            }
+          }
+        },
+        "operationId": "GET-dhcp-subnet-assignments"
+      },
+      "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)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/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)dhcp-subnet-assignmentsPOST"
+            }
+          }
+        },
+        "operationId": "POST-dhcp-subnet-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": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vf-module-id",
+            "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"
+            }
+          }
+        ],
+        "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(config)dhcp-subnet-assignments-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-dhcp-subnet-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/dhcp-subnet-assignments/dhcp-subnet-assignment/{neutron-subnet-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": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "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"
+          }
+        },
+        "operationId": "DELETE-dhcp-subnet-assignment"
+      },
+      "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": "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)dhcp-subnet-assignment"
+            }
+          }
+        },
+        "operationId": "GET-dhcp-subnet-assignment"
+      },
+      "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"
+          },
+          {
+            "description": "Same as subnet-id in subnet-data structure",
+            "in": "path",
+            "name": "neutron-subnet-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "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/vf-module-assignments/dhcp-subnet-assignments(config)dhcp-subnet-assignment-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/dhcp-subnet-assignments(config)dhcp-subnet-assignment-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-dhcp-subnet-assignment"
+      }
+    },
+    "/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",
@@ -50053,7 +53983,7 @@
         "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/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -50248,7 +54178,7 @@
         "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}/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -50443,7 +54373,7 @@
         "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/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -50662,7 +54592,7 @@
         "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}/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -50881,7 +54811,7 @@
         "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/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -51136,7 +55066,7 @@
         "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}/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -51383,7 +55313,7 @@
         "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": {
+    "/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",
@@ -51562,7 +55492,7 @@
         "operationId": "PUT-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-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": {
       "delete": {
         "produces": [
           "application/json",
@@ -51809,7 +55739,7 @@
         "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/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -52080,7 +56010,7 @@
         "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}/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -52351,7 +56281,7 @@
         "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/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -52658,7 +56588,7 @@
         "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": {
+    "/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",
@@ -52876,7 +56806,7 @@
         "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/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -53175,7 +57105,7 @@
         "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/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -53502,7 +57432,7 @@
         "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}/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/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",
@@ -53741,7 +57671,7 @@
         "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": {
+    "/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",
@@ -53908,7 +57838,7 @@
         "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/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -54115,7 +58045,7 @@
         "operationId": "PUT-vm"
       }
     },
-    "/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}/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -54252,7 +58182,7 @@
         "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": {
+    "/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",
@@ -54443,7 +58373,7 @@
         "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}/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -54658,7 +58588,7 @@
         "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}/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -54873,7 +58803,7 @@
         "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}/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -55128,7 +59058,7 @@
         "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": {
+    "/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",
@@ -55367,7 +59297,7 @@
         "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}": {
+    "/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",
@@ -55561,7 +59491,7 @@
         "operationId": "PUT-vlan-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}/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -55800,7 +59730,7 @@
         "operationId": "PUT-vnfc-ports"
       }
     },
-    "/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -56067,7 +59997,7 @@
         "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": {
+    "/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",
@@ -56334,7 +60264,7 @@
         "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}/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -56637,7 +60567,7 @@
         "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/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}/floating-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -56852,7 +60782,7 @@
         "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": {
+    "/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",
@@ -57147,7 +61077,7 @@
         "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}/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -57470,7 +61400,7 @@
         "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": {
+    "/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",
@@ -57706,7 +61636,7 @@
         "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-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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -57973,7 +61903,7 @@
         "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}/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -58268,7 +62198,7 @@
         "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}": {
+    "/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",
@@ -58504,7 +62434,7 @@
         "operationId": "PUT-vnfc-subnet-ip"
       }
     },
-    "/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -58695,7 +62625,7 @@
         "operationId": "PUT-vm-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}": {
+    "/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",
@@ -58954,7 +62884,7 @@
         "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": {
+    "/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",
@@ -59112,7 +63042,7 @@
         "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": {
+    "/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",
@@ -59270,7 +63200,7 @@
         "operationId": "PUT-interface-route-prefixes"
       }
     },
-    "/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}/mac-addresses": {
       "delete": {
         "produces": [
           "application/json",
@@ -59428,7 +63358,7 @@
         "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": {
+    "/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",
@@ -59647,7 +63577,7 @@
         "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}/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}/network-information-items/network-information-item/{ip-version}": {
       "delete": {
         "produces": [
           "application/json",
@@ -59894,7 +63824,7 @@
         "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-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}/network-information-items/network-information-item/{ip-version}/network-ips": {
       "delete": {
         "produces": [
           "application/json",
@@ -60073,7 +64003,7 @@
         "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": {
+    "/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",
@@ -60292,7 +64222,7 @@
         "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}/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}/related-networks/related-network/{network-id}": {
       "delete": {
         "produces": [
           "application/json",
@@ -60539,7 +64469,7 @@
         "operationId": "PUT-related-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}/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}/related-networks/related-network/{network-id}/vlan-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -60718,7 +64648,7 @@
         "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}/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -60945,7 +64875,7 @@
         "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": {
+    "/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",
@@ -61172,7 +65102,7 @@
         "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/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-assignments/vms/vm/{vm-type}/vm-networks/vm-network/{network-role}/sriov-parameters/application-tags/c-tags": {
       "delete": {
         "produces": [
           "application/json",
@@ -61330,7 +65260,7 @@
         "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": {
+    "/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",
@@ -61488,7 +65418,7 @@
         "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": {
+    "/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",
@@ -61646,7 +65576,7 @@
         "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": {
+    "/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",
@@ -61813,7 +65743,7 @@
         "operationId": "PUT-vf-module-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-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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -62004,7 +65934,7 @@
         "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-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-parameters/param/{name}/resource-resolution-data": {
       "delete": {
         "produces": [
           "application/json",
@@ -62195,7 +66125,7 @@
         "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}": {
+    "/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",
@@ -62350,7 +66280,7 @@
         "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-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/vf-module-topology/vf-module-topology-identifier": {
       "delete": {
         "produces": [
           "application/json",
@@ -62469,7 +66399,7 @@
         "operationId": "PUT-vf-module-topology-identifier"
       }
     },
-    "/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/vf-modules/vf-module/{vf-module-id}/vf-module-data/vnf-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -62636,7 +66566,7 @@
         "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/vf-modules/vf-module/{vf-module-id}/vf-module-data/vnf-information/onap-model-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -62755,7 +66685,7 @@
         "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-information": {
       "delete": {
         "produces": [
           "application/json",
@@ -62898,7 +66828,7 @@
         "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": {
+    "/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",
@@ -62999,7 +66929,7 @@
         "operationId": "PUT-onap-model-information"
       }
     },
-    "/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-level-oper-status": {
       "delete": {
         "produces": [
           "application/json",
@@ -63100,7 +67030,7 @@
         "operationId": "PUT-vnf-level-oper-status"
       }
     },
-    "/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": {
       "delete": {
         "produces": [
           "application/json",
@@ -63243,7 +67173,7 @@
         "operationId": "PUT-vnf-network-collections"
       }
     },
-    "/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}": {
       "delete": {
         "produces": [
           "application/json",
@@ -63347,6 +67277,14 @@
           },
           {
             "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": {
@@ -63414,7 +67352,321 @@
         "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/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}/networks": {
+      "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"
+          },
+          {
+            "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"
+          }
+        },
+        "operationId": "DELETE-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"
+          },
+          {
+            "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)networks"
+            }
+          }
+        },
+        "operationId": "GET-networks"
+      },
+      "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)network",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection/networks(config)network-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)networksPOST"
+            }
+          }
+        },
+        "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"
+          },
+          {
+            "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"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/GENERIC-RESOURCE-API/services/service/service-data/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection(config)networks-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-networks"
+      }
+    },
+    "/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",
+          "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"
+          },
+          {
+            "description": "Index into network-topology-identifier structure",
+            "in": "path",
+            "name": "network-id",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-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": "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"
+          },
+          {
+            "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)network"
+            }
+          }
+        },
+        "operationId": "GET-network"
+      },
+      "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"
+          },
+          {
+            "description": "Network Instance-Group function in A&AI",
+            "in": "path",
+            "name": "network-instance-group-function",
+            "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/vnfs/vnf/vnf-data/vnf-network-collections/vnf-network-collection/networks(config)network-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$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-network"
+      }
+    },
+    "/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"
         },
@@ -95125,6 +100485,61 @@
       },
       "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:ip-version": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Use values 4 or 6."
+        },
+        "GENERIC-RESOURCE-API:route-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique id"
+        },
+        "GENERIC-RESOURCE-API:start-address": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)aggregate-routes-TOP": {
+      "properties": {
+        "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"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/services/service/service-data/network-instance-groups/network-instance-group(config)networks": {
       "properties": {
         "GENERIC-RESOURCE-API:network": {
@@ -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"
@@ -96183,6 +101610,704 @@
       },
       "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/pnfs/pnf/pnf-data/pnf-details(config)onap-model-information"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-request-input(config)pnf-input-parameters": {
+      "properties": {
+        "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: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/pnfs/pnf/pnf-data/pnf-request-input/pnf-input-parameters(config)param-TOP": {
+      "properties": {
+        "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/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/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/pnfs/pnf/pnf-data/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/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/pnfs/pnf/pnf-data/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/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": "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-topology(config)onap-model-information-TOP": {
+      "properties": {
+        "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"
+        }
+      },
+      "type": "object"
+    },
+    "GENERIC-RESOURCE-API/services/service/service-data/pnfs/pnf/pnf-data/pnf-topology(config)pnf-parameters-data": {
+      "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(config)pnf-parameters-data-TOP": {
+      "properties": {
+        "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: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: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: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": "SUCCESS, FAILED, or PENDING - RA returned data as capability"
+        }
+      },
+      "type": "object"
+    },
+    "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: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"
+        }
+      },
+      "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": {
+      "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",
+          "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/service-information(config)onap-model-information-TOP": {
+      "properties": {
+        "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"
+        }
+      },
+      "type": "object"
+    },
     "GENERIC-RESOURCE-API/services/service/service-data/provided-allotted-resources(config)provided-allotted-resource": {
       "properties": {
         "GENERIC-RESOURCE-API:allotted-resource-id": {
@@ -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"
@@ -97962,6 +104103,12 @@
     },
     "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: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"
+        },
         "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": {}
   }
 }
author	Dan Timoney <dtimoney@att.com>	2020-01-22 12:29:21 -0500
committer	Dan Timoney <dtimoney@att.com>	2020-01-22 12:29:21 -0500
commit	2706e94c5116b1de370e482a31b2ad1d610df774 (patch)
tree	3f047999db27ba1995a6ea8d8089d14dc7870fc0 /generic-resource-api/model/src
parent	8c8634e2b272a625bf7434e428c85ac91793c068 (diff)