Update swagger documentation

Updated swagger documentation for SDNC northbound APIs.

Change-Id: Ic3c2cb6bd6cd1bb8a732f087ee614e7969d1757b
Issue-ID: SDNC-427
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>

1 files changed, 10304 insertions, 1702 deletions

diff --git a/vnfapi/model/src/main/resources/vnf-api.20150720.json b/vnfapi/model/src/main/resources/vnf-api.20150720.json
index 016cc9d0..5319ed34 100644
--- a/vnfapi/model/src/main/resources/vnf-api.20150720.json
+++ b/vnfapi/model/src/main/resources/vnf-api.20150720.json
@@ -1710,6 +1710,61 @@
         },
         "operationId": "GET-vm-names"
       },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vm-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vm-names"
+      },
       "put": {
         "consumes": [
           "application/json",
@@ -1766,6 +1821,1263 @@
         "operationId": "PUT-vm-names"
       }
     },
+    "/config/VNF-API:preload-vf-modules/vf-module-preload-list/{vf-module-name}/{vf-module-model-id}/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-names"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-names"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-names"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-names"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-names"
+      }
+    },
+    "/config/VNF-API:preload-vf-modules/vf-module-preload-list/{vf-module-name}/{vf-module-model-id}/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-networks"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networks"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-networks"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networksPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-networks"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-networks"
+      }
+    },
+    "/config/VNF-API:preload-vf-modules/vf-module-preload-list/{vf-module-name}/{vf-module-model-id}/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnets"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnets"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnets"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnetsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-subnets"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnets"
+      }
+    },
+    "/config/VNF-API:preload-vf-modules/vf-module-preload-list/{vf-module-name}/{vf-module-model-id}/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-ipassignments"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignments"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-ipassignments"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignmentsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-ipassignments"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-ipassignments"
+      }
+    },
+    "/config/VNF-API:preload-vf-modules/vf-module-preload-list/{vf-module-name}/{vf-module-model-id}/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}/vnfc-subnet-ips/{vnfc-client-key}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnet-ips"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnet-ips"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnet-ips"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vf-module-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vf-module-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnet-ips"
+      }
+    },
     "/config/VNF-API:preload-vf-modules/vf-module-preload-list/{vf-module-name}/{vf-module-model-id}/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}": {
       "delete": {
         "produces": [
@@ -1993,7 +3305,7 @@
         "operationId": "PUT-vm-networks"
       }
     },
-    "/config/VNF-API:preload-vf-modules/vf-module-preload-list/{vf-module-name}/{vf-module-model-id}/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix-cidr}": {
+    "/config/VNF-API:preload-vf-modules/vf-module-preload-list/{vf-module-name}/{vf-module-model-id}/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix}": {
       "delete": {
         "produces": [
           "application/json",
@@ -2028,9 +3340,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -2076,9 +3388,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -2131,9 +3443,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           },
@@ -3353,18 +4665,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)service-information",
+            "name": "**(config)vnf-parameters",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information(config)service-information-TOP"
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information(config)vnf-parameters-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)vnf-parameters",
+            "name": "**(config)service-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information(config)vnf-parameters-TOP"
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information(config)service-information-TOP"
             }
           },
           {
@@ -4415,6 +5727,61 @@
         },
         "operationId": "GET-vm-names"
       },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vm-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vm-names"
+      },
       "put": {
         "consumes": [
           "application/json",
@@ -4471,6 +5838,1263 @@
         "operationId": "PUT-vm-names"
       }
     },
+    "/config/VNF-API:preload-vnf-instances/vnf-instance-preload-list/{vnf-instance-name}/{vnf-model-id}/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-names"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-names"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-names"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-names"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-names"
+      }
+    },
+    "/config/VNF-API:preload-vnf-instances/vnf-instance-preload-list/{vnf-instance-name}/{vnf-model-id}/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-networks"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networks"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-networks"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networksPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-networks"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-networks"
+      }
+    },
+    "/config/VNF-API:preload-vnf-instances/vnf-instance-preload-list/{vnf-instance-name}/{vnf-model-id}/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnets"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnets"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnets"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnetsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-subnets"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnets"
+      }
+    },
+    "/config/VNF-API:preload-vnf-instances/vnf-instance-preload-list/{vnf-instance-name}/{vnf-model-id}/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-ipassignments"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignments"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-ipassignments"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignmentsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-ipassignments"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-ipassignments"
+      }
+    },
+    "/config/VNF-API:preload-vnf-instances/vnf-instance-preload-list/{vnf-instance-name}/{vnf-model-id}/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}/vnfc-subnet-ips/{vnfc-client-key}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnet-ips"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnet-ips"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnet-ips"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vnf-instance-name, aka generic-vnf-name",
+            "in": "path",
+            "name": "vnf-instance-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vnf-model-id, aka generic-vnf-type",
+            "in": "path",
+            "name": "vnf-model-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnet-ips"
+      }
+    },
     "/config/VNF-API:preload-vnf-instances/vnf-instance-preload-list/{vnf-instance-name}/{vnf-model-id}/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}": {
       "delete": {
         "produces": [
@@ -4698,7 +7322,7 @@
         "operationId": "PUT-vm-networks"
       }
     },
-    "/config/VNF-API:preload-vnf-instances/vnf-instance-preload-list/{vnf-instance-name}/{vnf-model-id}/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix-cidr}": {
+    "/config/VNF-API:preload-vnf-instances/vnf-instance-preload-list/{vnf-instance-name}/{vnf-model-id}/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix}": {
       "delete": {
         "produces": [
           "application/json",
@@ -4733,9 +7357,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -4781,9 +7405,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -4836,9 +7460,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           },
@@ -6066,42 +8690,42 @@
           },
           {
             "in": "body",
-            "name": "**(config)provider-network-information",
+            "name": "**(config)network-policy",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)provider-network-information-TOP"
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-policy-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)vpn-bindings",
+            "name": "**(config)network-topology-identifier",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)vpn-bindings-TOP"
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-topology-identifier-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)network-topology-identifier",
+            "name": "**(config)vpn-bindings",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-topology-identifier-TOP"
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)vpn-bindings-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)route-table-reference",
+            "name": "**(config)provider-network-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)route-table-reference-TOP"
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)provider-network-information-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)network-policy",
+            "name": "**(config)route-table-reference",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-policy-TOP"
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)route-table-reference-TOP"
             }
           },
           {
@@ -6691,6 +9315,55 @@
         },
         "operationId": "GET-subnets"
       },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "start-address",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)host-routes",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information/subnets(config)host-routes-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)subnetsPOST"
+            }
+          }
+        },
+        "operationId": "POST-subnets"
+      },
       "put": {
         "consumes": [
           "application/json",
@@ -6741,6 +9414,146 @@
         "operationId": "PUT-subnets"
       }
     },
+    "/config/VNF-API:preload-vnfs/vnf-preload-list/{vnf-name}/{vnf-type}/preload-data/network-topology-information/subnets/{start-address}/host-routes/{route-prefix}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "start-address",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "route-prefix",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-host-routes"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "start-address",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "route-prefix",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)host-routes"
+            }
+          }
+        },
+        "operationId": "GET-host-routes"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "start-address",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "route-prefix",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)host-routes",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information/subnets(config)host-routes-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information/subnets(config)host-routes-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-host-routes"
+      }
+    },
     "/config/VNF-API:preload-vnfs/vnf-preload-list/{vnf-name}/{vnf-type}/preload-data/network-topology-information/vpn-bindings/{vpn-binding-id}": {
       "delete": {
         "produces": [
@@ -8003,6 +10816,61 @@
         },
         "operationId": "GET-vm-names"
       },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vm-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vm-names"
+      },
       "put": {
         "consumes": [
           "application/json",
@@ -8059,6 +10927,1263 @@
         "operationId": "PUT-vm-names"
       }
     },
+    "/config/VNF-API:preload-vnfs/vnf-preload-list/{vnf-name}/{vnf-type}/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-names"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-names"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-names"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-names"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-names"
+      }
+    },
+    "/config/VNF-API:preload-vnfs/vnf-preload-list/{vnf-name}/{vnf-type}/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-networks"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networks"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-networks"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networksPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-networks"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-networks"
+      }
+    },
+    "/config/VNF-API:preload-vnfs/vnf-preload-list/{vnf-name}/{vnf-type}/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnets"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnets"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnets"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnetsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-subnets"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnets"
+      }
+    },
+    "/config/VNF-API:preload-vnfs/vnf-preload-list/{vnf-name}/{vnf-type}/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-ipassignments"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignments"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-ipassignments"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignmentsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-ipassignments"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-ipassignments"
+      }
+    },
+    "/config/VNF-API:preload-vnfs/vnf-preload-list/{vnf-name}/{vnf-type}/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}/vnfc-subnet-ips/{vnfc-client-key}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnet-ips"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnet-ips"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnet-ips"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-name",
+            "in": "path",
+            "name": "vnf-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "vf-module-type",
+            "in": "path",
+            "name": "vnf-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnet-ips"
+      }
+    },
     "/config/VNF-API:preload-vnfs/vnf-preload-list/{vnf-name}/{vnf-type}/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}": {
       "delete": {
         "produces": [
@@ -8286,7 +12411,7 @@
         "operationId": "PUT-vm-networks"
       }
     },
-    "/config/VNF-API:preload-vnfs/vnf-preload-list/{vnf-name}/{vnf-type}/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix-cidr}": {
+    "/config/VNF-API:preload-vnfs/vnf-preload-list/{vnf-name}/{vnf-type}/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix}": {
       "delete": {
         "produces": [
           "application/json",
@@ -8321,9 +12446,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -8369,9 +12494,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -8424,9 +12549,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           },
@@ -9541,10 +13666,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)service-information",
+            "name": "**(config)request-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data(config)service-information-TOP"
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data(config)request-information-TOP"
             }
           },
           {
@@ -9557,10 +13682,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)request-information",
+            "name": "**(config)service-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data(config)request-information-TOP"
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data(config)service-information-TOP"
             }
           },
           {
@@ -10993,6 +15118,54 @@
         },
         "operationId": "GET-vm-names"
       },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vm-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vm-names"
+      },
       "put": {
         "consumes": [
           "application/json",
@@ -11042,6 +15215,1130 @@
         "operationId": "PUT-vm-names"
       }
     },
+    "/config/VNF-API:vf-modules/vf-module-list/{vf-module-id}/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-names"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-names"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-names"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-names"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-names"
+      }
+    },
+    "/config/VNF-API:vf-modules/vf-module-list/{vf-module-id}/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-networks"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networks"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-networks"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networksPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-networks"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-networks"
+      }
+    },
+    "/config/VNF-API:vf-modules/vf-module-list/{vf-module-id}/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnets"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnets"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnets"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnetsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-subnets"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnets"
+      }
+    },
+    "/config/VNF-API:vf-modules/vf-module-list/{vf-module-id}/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-ipassignments"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignments"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-ipassignments"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignmentsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-ipassignments"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-ipassignments"
+      }
+    },
+    "/config/VNF-API:vf-modules/vf-module-list/{vf-module-id}/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}/vnfc-subnet-ips/{vnfc-client-key}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnet-ips"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnet-ips"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnet-ips"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vf-module-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnet-ips"
+      }
+    },
     "/config/VNF-API:vf-modules/vf-module-list/{vf-module-id}/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}": {
       "delete": {
         "produces": [
@@ -11241,7 +16538,7 @@
         "operationId": "PUT-vm-networks"
       }
     },
-    "/config/VNF-API:vf-modules/vf-module-list/{vf-module-id}/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix-cidr}": {
+    "/config/VNF-API:vf-modules/vf-module-list/{vf-module-id}/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix}": {
       "delete": {
         "produces": [
           "application/json",
@@ -11269,9 +16566,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -11310,9 +16607,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -11358,9 +16655,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           },
@@ -12279,14 +17576,6 @@
           },
           {
             "in": "body",
-            "name": "**(config)oper-status",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data(config)oper-status-TOP"
-            }
-          },
-          {
-            "in": "body",
             "name": "**(config)vf-module-relationship-list",
             "required": false,
             "schema": {
@@ -12295,10 +17584,10 @@
           },
           {
             "in": "body",
-            "name": "**(config)request-information",
+            "name": "**(config)oper-status",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data(config)request-information-TOP"
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data(config)oper-status-TOP"
             }
           },
           {
@@ -12319,6 +17608,14 @@
           },
           {
             "in": "body",
+            "name": "**(config)request-information",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data(config)request-information-TOP"
+            }
+          },
+          {
+            "in": "body",
             "name": "**(config)vnf-instance-request-information",
             "required": false,
             "schema": {
@@ -13108,18 +18405,18 @@
           },
           {
             "in": "body",
-            "name": "**(config)service-information",
+            "name": "**(config)vnf-parameters",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information(config)service-information-TOP"
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information(config)vnf-parameters-TOP"
             }
           },
           {
             "in": "body",
-            "name": "**(config)vnf-parameters",
+            "name": "**(config)service-information",
             "required": false,
             "schema": {
-              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information(config)vnf-parameters-TOP"
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information(config)service-information-TOP"
             }
           },
           {
@@ -14002,6 +19299,54 @@
         },
         "operationId": "GET-vm-names"
       },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vm-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vm-names"
+      },
       "put": {
         "consumes": [
           "application/json",
@@ -14051,6 +19396,1130 @@
         "operationId": "PUT-vm-names"
       }
     },
+    "/config/VNF-API:vnf-instances/vnf-instance-list/{vnf-instance-id}/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-names"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-names"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-names"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-names"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-names"
+      }
+    },
+    "/config/VNF-API:vnf-instances/vnf-instance-list/{vnf-instance-id}/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-networks"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networks"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-networks"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networksPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-networks"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-networks"
+      }
+    },
+    "/config/VNF-API:vnf-instances/vnf-instance-list/{vnf-instance-id}/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnets"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnets"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnets"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnetsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-subnets"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnets"
+      }
+    },
+    "/config/VNF-API:vnf-instances/vnf-instance-list/{vnf-instance-id}/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-ipassignments"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignments"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-ipassignments"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignmentsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-ipassignments"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-ipassignments"
+      }
+    },
+    "/config/VNF-API:vnf-instances/vnf-instance-list/{vnf-instance-id}/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}/vnfc-subnet-ips/{vnfc-client-key}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnet-ips"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnet-ips"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnet-ips"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "generic-vnf-id",
+            "in": "path",
+            "name": "vnf-instance-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnet-ips"
+      }
+    },
     "/config/VNF-API:vnf-instances/vnf-instance-list/{vnf-instance-id}/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}": {
       "delete": {
         "produces": [
@@ -14250,7 +20719,7 @@
         "operationId": "PUT-vm-networks"
       }
     },
-    "/config/VNF-API:vnf-instances/vnf-instance-list/{vnf-instance-id}/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix-cidr}": {
+    "/config/VNF-API:vnf-instances/vnf-instance-list/{vnf-instance-id}/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix}": {
       "delete": {
         "produces": [
           "application/json",
@@ -14278,9 +20747,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -14319,9 +20788,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -14367,9 +20836,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           },
@@ -16808,6 +23277,54 @@
         },
         "operationId": "GET-vm-names"
       },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vm-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vm-names"
+      },
       "put": {
         "consumes": [
           "application/json",
@@ -16857,6 +23374,1130 @@
         "operationId": "PUT-vm-names"
       }
     },
+    "/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-names"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-names"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-names"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-namesPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-names"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-names",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-names"
+      }
+    },
+    "/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-networks"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networks"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-networks"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-networksPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-networks"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-networks",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-networks"
+      }
+    },
+    "/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnets"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnets"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnets"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnetsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-subnets"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnets",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnets"
+      }
+    },
+    "/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-ipassignments"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignments"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-ipassignments"
+      },
+      "post": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "**(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-ipassignmentsPOST"
+            }
+          }
+        },
+        "operationId": "POST-vnfc-ipassignments"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-ipassignments",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-ipassignments"
+      }
+    },
+    "/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-names/{vm-name}/vnfc-names/{vnfc-name}/vnfc-networks/{vnfc-network-role}/vnfc-subnets/{vnfc-subnet-role}/vnfc-ipassignments/{vnfc-address-family}/vnfc-subnet-ips/{vnfc-client-key}": {
+      "delete": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified"
+          }
+        },
+        "operationId": "DELETE-vnfc-subnet-ips"
+      },
+      "get": {
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/(config)vnfc-subnet-ips"
+            }
+          }
+        },
+        "operationId": "GET-vnfc-subnet-ips"
+      },
+      "put": {
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "description": "vf-module-id",
+            "in": "path",
+            "name": "vnf-id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-type",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vm-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-network-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-subnet-role",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Subnet Version tells if this is IpV4 or IpV6",
+            "in": "path",
+            "name": "vnfc-address-family",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "path",
+            "name": "vnfc-client-key",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "(config)vnfc-subnet-ips",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "No response was specified",
+            "schema": {
+              "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP"
+            }
+          }
+        },
+        "operationId": "PUT-vnfc-subnet-ips"
+      }
+    },
     "/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}": {
       "delete": {
         "produces": [
@@ -17056,7 +24697,7 @@
         "operationId": "PUT-vm-networks"
       }
     },
-    "/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix-cidr}": {
+    "/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/vnf-topology-information/vnf-assignments/vnf-vms/{vm-type}/vm-networks/{network-role}/interface-route-prefixes/{interface-route-prefix}": {
       "delete": {
         "produces": [
           "application/json",
@@ -17084,9 +24725,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -17125,9 +24766,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           }
@@ -17173,9 +24814,9 @@
             "type": "string"
           },
           {
-            "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes",
+            "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
             "in": "path",
-            "name": "interface-route-prefix-cidr",
+            "name": "interface-route-prefix",
             "required": true,
             "type": "string"
           },
@@ -18294,24 +25935,32 @@
     "(config)availability-zonesPOST": {
       "properties": {
         "availability-zone": {
-          "$ref": "#/definitions/Some availability-zone",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Openstack availability zone name or UUID"
         }
       },
       "type": "object"
     },
+    "(config)host-routesPOST": {
+      "properties": {
+        "next-hop": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Could be ip-address or hostname or service-instance"
+        },
+        "route-prefix": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
     "(config)interface-route-prefixesPOST": {
       "properties": {
         "interface-route-prefix": {
-          "$ref": "#/definitions/28.2.242.0%LLLpLL",
-          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
-          "enum": [
-            "28.2.242.0%LLLpLL",
-            "D7c:A:2"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"
         },
         "interface-route-prefix-cidr": {
-          "$ref": "#/definitions/Some interface-route-prefix-cidr",
+          "$ref": "#/definitions/Optional.empty",
           "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"
         }
       },
@@ -18320,10 +25969,10 @@
     "(config)network-informationPOST": {
       "properties": {
         "network-id": {
-          "$ref": "#/definitions/Some network-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "network-service-type": {
-          "$ref": "#/definitions/Some network-service-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18331,7 +25980,7 @@
     "(config)network-ips-v6POST": {
       "properties": {
         "ip-address-ipv6": {
-          "$ref": "#/definitions/C61D:",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of assigned ipv6 addresses on a network"
         }
       },
@@ -18340,12 +25989,8 @@
     "(config)network-ipsPOST": {
       "properties": {
         "ip-address": {
-          "$ref": "#/definitions/0.12.2.0%L",
-          "description": "List of assigned ipv4 addresses on a network",
-          "enum": [
-            "0.12.2.0%L",
-            "4:"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "List of assigned ipv4 addresses on a network"
         }
       },
       "type": "object"
@@ -18353,7 +25998,7 @@
     "(config)network-macsPOST": {
       "properties": {
         "mac-address": {
-          "$ref": "#/definitions/Some mac-address",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of network assignments for this VM (one per network)"
         }
       },
@@ -18362,10 +26007,10 @@
     "(config)network-policyPOST": {
       "properties": {
         "network-policy-fqdn": {
-          "$ref": "#/definitions/Some network-policy-fqdn"
+          "$ref": "#/definitions/Optional.empty"
         },
         "network-policy-id": {
-          "$ref": "#/definitions/Some network-policy-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18373,23 +26018,23 @@
     "(config)network-request-informationPOST": {
       "properties": {
         "aic-clli": {
-          "$ref": "#/definitions/Some aic-clli"
+          "$ref": "#/definitions/Optional.empty"
         },
         "aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "network-id": {
-          "$ref": "#/definitions/Some network-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "network-name": {
-          "$ref": "#/definitions/Some network-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "network-type": {
-          "$ref": "#/definitions/Some network-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18397,19 +26042,19 @@
     "(config)network-topology-identifierPOST": {
       "properties": {
         "network-name": {
-          "$ref": "#/definitions/Some network-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "network-role": {
-          "$ref": "#/definitions/Some network-role"
+          "$ref": "#/definitions/Optional.empty"
         },
         "network-technology": {
-          "$ref": "#/definitions/Some network-technology"
+          "$ref": "#/definitions/Optional.empty"
         },
         "network-type": {
-          "$ref": "#/definitions/Some network-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "service-type": {
-          "$ref": "#/definitions/Some service-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18458,62 +26103,25 @@
     "(config)oper-statusPOST": {
       "properties": {
         "create-timestamp": {
-          "$ref": "#/definitions/Some create-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "last-action": {
-          "$ref": "#/definitions/VNFActivateRequest",
-          "enum": [
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVNFRequest",
-            "DisconnectVnfInstanceRequest",
-            "DisconnectVfModuleRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "last-order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "last-svc-request-id": {
-          "$ref": "#/definitions/Some last-svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "maintenance-indicator": {
-          "$ref": "#/definitions/Y",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "modify-timestamp": {
-          "$ref": "#/definitions/Some modify-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18577,16 +26185,16 @@
     "(config)provider-network-informationPOST": {
       "properties": {
         "is-external-network": {
-          "$ref": "#/definitions/true"
+          "$ref": "#/definitions/Optional.empty"
         },
         "is-provider-network": {
-          "$ref": "#/definitions/true"
+          "$ref": "#/definitions/Optional.empty"
         },
         "is-shared-network": {
-          "$ref": "#/definitions/true"
+          "$ref": "#/definitions/Optional.empty"
         },
         "physical-network-name": {
-          "$ref": "#/definitions/Some physical-network-name"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18594,50 +26202,25 @@
     "(config)request-informationPOST": {
       "properties": {
         "notification-url": {
-          "$ref": "#/definitions/Some notification-url"
+          "$ref": "#/definitions/Optional.empty"
         },
         "order-number": {
-          "$ref": "#/definitions/Some order-number"
+          "$ref": "#/definitions/Optional.empty"
         },
         "order-version": {
-          "$ref": "#/definitions/Some order-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "request-action": {
-          "$ref": "#/definitions/PreloadNetworkRequest",
-          "enum": [
-            "PreloadNetworkRequest",
-            "DeletePreloadNetworkRequest",
-            "NetworkActivateRequest",
-            "DisconnectNetworkRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "DisconnectVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "DisconnectVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "request-id": {
-          "$ref": "#/definitions/Some request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "request-sub-action": {
-          "$ref": "#/definitions/SUPP",
-          "enum": [
-            "SUPP",
-            "CANCEL"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "source": {
-          "$ref": "#/definitions/Some source"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18645,10 +26228,10 @@
     "(config)route-table-referencePOST": {
       "properties": {
         "route-table-reference-fqdn": {
-          "$ref": "#/definitions/Some route-table-reference-fqdn"
+          "$ref": "#/definitions/Optional.empty"
         },
         "route-table-reference-id": {
-          "$ref": "#/definitions/Some route-table-reference-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18656,22 +26239,13 @@
     "(config)sdnc-request-headerPOST": {
       "properties": {
         "svc-action": {
-          "$ref": "#/definitions/reserve",
-          "enum": [
-            "reserve",
-            "assign",
-            "activate",
-            "delete",
-            "changeassign",
-            "changedelete",
-            "rollback"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "svc-notification-url": {
-          "$ref": "#/definitions/Some svc-notification-url"
+          "$ref": "#/definitions/Optional.empty"
         },
         "svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18703,7 +26277,7 @@
           "type": "object"
         },
         "vnf-id": {
-          "$ref": "#/definitions/Some vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "vnf-request-information": {
@@ -18724,18 +26298,18 @@
     "(config)service-informationPOST": {
       "properties": {
         "service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "service-instance-id": {
-          "$ref": "#/definitions/Some service-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A service instance that a VNF or a l3-network is associated with"
         },
         "service-type": {
-          "$ref": "#/definitions/Some service-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI subscription-service-type"
         },
         "subscriber-name": {
-          "$ref": "#/definitions/Some subscriber-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI global-customer-id"
         }
       },
@@ -18744,78 +26318,31 @@
     "(config)service-statusPOST": {
       "properties": {
         "final-indicator": {
-          "$ref": "#/definitions/Some final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "request-status": {
-          "$ref": "#/definitions/synccomplete",
-          "enum": [
-            "synccomplete",
-            "asynccomplete",
-            "notifycomplete"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "response-timestamp": {
-          "$ref": "#/definitions/Some response-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "rpc-action": {
-          "$ref": "#/definitions/reserve",
-          "enum": [
-            "reserve",
-            "assign",
-            "activate",
-            "delete",
-            "changeassign",
-            "changedelete",
-            "rollback"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "rpc-name": {
-          "$ref": "#/definitions/vnf-topology-operation",
-          "enum": [
-            "vnf-topology-operation",
-            "preload-vnf-topology-operation",
-            "vnf-instance-topology-operation",
-            "preload-vnf-instance-topology-operation",
-            "vf-module-topology-operation",
-            "preload-vf-module-topology-operation"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnfsdn-action": {
-          "$ref": "#/definitions/PreloadNetworkRequest",
-          "enum": [
-            "PreloadNetworkRequest",
-            "DeletePreloadNetworkRequest",
-            "NetworkActivateRequest",
-            "DisconnectNetworkRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "DisconnectVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "DisconnectVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnfsdn-subaction": {
-          "$ref": "#/definitions/SUPP",
-          "enum": [
-            "SUPP",
-            "CANCEL"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18823,48 +26350,49 @@
     "(config)sriov-vlan-filter-listPOST": {
       "properties": {
         "sriov-vlan-filter": {
-          "$ref": "#/definitions/Some sriov-vlan-filter"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
     },
     "(config)subnetsPOST": {
       "properties": {
+        "addr-from-start": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Default is N"
+        },
         "cidr-mask": {
-          "$ref": "#/definitions/Some cidr-mask"
+          "$ref": "#/definitions/Optional.empty"
         },
         "dhcp-enabled": {
-          "$ref": "#/definitions/Y",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "dhcp-end-address": {
-          "$ref": "#/definitions/Some dhcp-end-address"
+          "$ref": "#/definitions/Optional.empty"
         },
         "dhcp-start-address": {
-          "$ref": "#/definitions/Some dhcp-start-address"
+          "$ref": "#/definitions/Optional.empty"
         },
         "gateway-address": {
-          "$ref": "#/definitions/12.3.29.0%p",
-          "enum": [
-            "12.3.29.0%p",
-            "1Abf:32:"
-          ]
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "host-routes": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/network-topology-information/subnets(config)host-routes"
+          },
+          "type": "array"
         },
         "ip-version": {
-          "$ref": "#/definitions/Some ip-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "start-address": {
-          "$ref": "#/definitions/15.1.5.0",
-          "enum": [
-            "15.1.5.0",
-            "bf:"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "subnet-name": {
-          "$ref": "#/definitions/Some subnet-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -18872,15 +26400,15 @@
     "(config)vf-module-identifiersPOST": {
       "properties": {
         "vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module id"
         },
         "vf-module-model-id": {
-          "$ref": "#/definitions/Some vf-module-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         },
         "vf-module-name": {
-          "$ref": "#/definitions/Some vf-module-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         }
       },
@@ -18889,7 +26417,7 @@
     "(config)vf-module-informationPOST": {
       "properties": {
         "vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         }
       },
@@ -18904,7 +26432,7 @@
           "type": "object"
         },
         "vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "vf-module-service-data": {
@@ -18939,11 +26467,11 @@
     "(config)vf-module-preload-listPOST": {
       "properties": {
         "vf-module-model-id": {
-          "$ref": "#/definitions/Some vf-module-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         },
         "vf-module-name": {
-          "$ref": "#/definitions/Some vf-module-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "vf-module-preload-data": {
@@ -18958,7 +26486,7 @@
     "(config)vf-module-relationship-listPOST": {
       "properties": {
         "vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         }
       },
@@ -18967,32 +26495,32 @@
     "(config)vf-module-request-informationPOST": {
       "properties": {
         "aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module id"
         },
         "vf-module-model-id": {
-          "$ref": "#/definitions/Some vf-module-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         },
         "vf-module-name": {
-          "$ref": "#/definitions/Some vf-module-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -19024,7 +26552,7 @@
           "type": "object"
         },
         "vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "vf-module-request-information": {
@@ -19079,7 +26607,13 @@
     "(config)vm-namesPOST": {
       "properties": {
         "vm-name": {
-          "$ref": "#/definitions/Some vm-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -19087,15 +26621,11 @@
     "(config)vm-networksPOST": {
       "properties": {
         "floating-ip": {
-          "$ref": "#/definitions/104.254.0.17%NLL}{Np}",
-          "description": "Floating ipv4 for VMs of a given type on this network",
-          "enum": [
-            "104.254.0.17%NLL}{Np}",
-            "01Eb:25:"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Floating ipv4 for VMs of a given type on this network"
         },
         "floating-ip-v6": {
-          "$ref": "#/definitions/:",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Floating ipv6 for VMs of a given type on this network"
         },
         "interface-route-prefixes": {
@@ -19105,9 +26635,13 @@
           "type": "array"
         },
         "ip-count": {
-          "$ref": "#/definitions/0",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The number of ip addresses to be assigned per vm for this network role"
         },
+        "ip-count-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ipv6 addresses to be assigned per vm for this network role"
+        },
         "network-ips": {
           "items": {
             "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips"
@@ -19127,16 +26661,16 @@
           "type": "array"
         },
         "network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF"
         },
+        "network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "use-dhcp": {
-          "$ref": "#/definitions/Y",
-          "description": "Indicator to use DHCP on this network for this VM",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VM"
         }
       },
       "type": "object"
@@ -19156,7 +26690,7 @@
           "type": "array"
         },
         "vnf-status": {
-          "$ref": "#/definitions/Some vnf-status",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration Status from AAI - to be set by SDNC"
         },
         "vnf-vms": {
@@ -19171,11 +26705,11 @@
     "(config)vnf-informationPOST": {
       "properties": {
         "vnf-id": {
-          "$ref": "#/definitions/Some vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "vnf-service-type": {
-          "$ref": "#/definitions/Some vnf-service-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -19183,13 +26717,13 @@
     "(config)vnf-instance-identifiersPOST": {
       "properties": {
         "vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -19197,7 +26731,7 @@
     "(config)vnf-instance-informationPOST": {
       "properties": {
         "vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vnf-instance-id"
         }
       },
@@ -19212,7 +26746,7 @@
           "type": "object"
         },
         "vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic-vnf-id"
         },
         "vnf-instance-service-data": {
@@ -19247,7 +26781,7 @@
     "(config)vnf-instance-preload-listPOST": {
       "properties": {
         "vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vnf-instance-name, aka generic-vnf-name"
         },
         "vnf-instance-preload-data": {
@@ -19257,7 +26791,7 @@
           "type": "object"
         },
         "vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vnf-model-id, aka generic-vnf-type"
         }
       },
@@ -19266,23 +26800,23 @@
     "(config)vnf-instance-request-informationPOST": {
       "properties": {
         "aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "request-version": {
-          "$ref": "#/definitions/Some request-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnf-networks": {
           "items": {
@@ -19326,7 +26860,7 @@
           "type": "array"
         },
         "vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vnf-instance-id"
         },
         "vnf-instance-request-information": {
@@ -19399,7 +26933,7 @@
           "type": "object"
         },
         "vnf-id": {
-          "$ref": "#/definitions/Some vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         }
       },
@@ -19411,46 +26945,55 @@
     "(config)vnf-networksPOST": {
       "properties": {
         "contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
-        "sriov-vlan-filter-list": {
-          "items": {
-            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-networks(config)sriov-vlan-filter-list"
-          },
-          "type": "array"
-        },
         "subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -19458,11 +27001,11 @@
     "(config)vnf-parametersPOST": {
       "properties": {
         "vnf-parameter-name": {
-          "$ref": "#/definitions/Some vnf-parameter-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The name of an arbitrary instance-specific vnf-parameters"
         },
         "vnf-parameter-value": {
-          "$ref": "#/definitions/Some vnf-parameter-value",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The value of an arbitrary instance-specific vnf-parameters "
         }
       },
@@ -19477,11 +27020,11 @@
           "type": "object"
         },
         "vnf-name": {
-          "$ref": "#/definitions/Some vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "vnf-type": {
-          "$ref": "#/definitions/Some vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         }
       },
@@ -19490,45 +27033,41 @@
     "(config)vnf-request-informationPOST": {
       "properties": {
         "aic-clli": {
-          "$ref": "#/definitions/Some aic-clli"
+          "$ref": "#/definitions/Optional.empty"
         },
         "aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "generic-vnf-id": {
-          "$ref": "#/definitions/Some generic-vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic vnf-id"
         },
         "generic-vnf-name": {
-          "$ref": "#/definitions/Some generic-vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic vnf name"
         },
         "generic-vnf-type": {
-          "$ref": "#/definitions/Some generic-vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic vnf type"
         },
         "model-customization-uuid": {
-          "$ref": "#/definitions/Some model-customization-uuid",
+          "$ref": "#/definitions/Optional.empty",
           "description": "customized resource, i.e. vf-module, for use within a given service"
         },
         "tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         },
         "use-preload": {
-          "$ref": "#/definitions/Y",
-          "description": "orchestrate vf-module with full preload data or TOSCA lookup plus EIPAM automation",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "orchestrate vf-module with full preload data or TOSCA lookup plus EIPAM automation"
         },
         "vnf-id": {
-          "$ref": "#/definitions/Some vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "vnf-name": {
-          "$ref": "#/definitions/Some vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "vnf-networks": {
@@ -19538,10 +27077,10 @@
           "type": "array"
         },
         "vnf-request-version": {
-          "$ref": "#/definitions/Some vnf-request-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnf-type": {
-          "$ref": "#/definitions/Some vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         }
       },
@@ -19550,26 +27089,26 @@
     "(config)vnf-topology-identifierPOST": {
       "properties": {
         "generic-vnf-id": {
-          "$ref": "#/definitions/Some generic-vnf-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "generic-vnf-name": {
-          "$ref": "#/definitions/Some generic-vnf-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "generic-vnf-type": {
-          "$ref": "#/definitions/Some generic-vnf-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "service-type": {
-          "$ref": "#/definitions/Some service-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vnf-name": {
-          "$ref": "#/definitions/Some vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "vnf-type": {
-          "$ref": "#/definitions/Some vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         }
       },
@@ -19601,7 +27140,7 @@
     "(config)vnf-vmsPOST": {
       "properties": {
         "vm-count": {
-          "$ref": "#/definitions/0"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vm-names": {
           "items": {
@@ -19616,7 +27155,92 @@
           "type": "array"
         },
         "vm-type": {
-          "$ref": "#/definitions/Some vm-type"
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "(config)vnfc-ipassignmentsPOST": {
+      "properties": {
+        "vnfc-address-family": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Subnet Version tells if this is IpV4 or IpV6"
+        },
+        "vnfc-subnet-dhcp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VNFC. Unless dhcp=N, we wouldnt have any address, since they would not be sdnc assigned "
+        },
+        "vnfc-subnet-ipcount": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ip addresses to be assigned per vnfc for this subnet role"
+        },
+        "vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "(config)vnfc-namesPOST": {
+      "properties": {
+        "vnfc-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "(config)vnfc-networksPOST": {
+      "properties": {
+        "vnfc-network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "(config)vnfc-subnet-ipsPOST": {
+      "properties": {
+        "ip-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. "
+        },
+        "vnfc-address-ipv4": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion. "
+        },
+        "vnfc-address-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion."
+        },
+        "vnfc-client-key": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "(config)vnfc-subnetsPOST": {
+      "properties": {
+        "vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        },
+        "vnfc-subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -19635,10 +27259,10 @@
     "(config)vpn-bindingsPOST": {
       "properties": {
         "global-route-target": {
-          "$ref": "#/definitions/Some global-route-target"
+          "$ref": "#/definitions/Optional.empty"
         },
         "vpn-binding-id": {
-          "$ref": "#/definitions/Some vpn-binding-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -19686,7 +27310,7 @@
     "(network-topology-operation)output": {
       "properties": {
         "VNF-API:ack-final-indicator": {
-          "$ref": "#/definitions/Some ack-final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-information": {
           "items": {
@@ -19695,10 +27319,10 @@
           "type": "object"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-information": {
           "items": {
@@ -19707,7 +27331,7 @@
           "type": "object"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -19760,16 +27384,16 @@
     "(preload-network-topology-operation)output": {
       "properties": {
         "VNF-API:ack-final-indicator": {
-          "$ref": "#/definitions/Some ack-final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -19822,16 +27446,16 @@
     "(preload-vf-module-topology-operation)output": {
       "properties": {
         "VNF-API:ack-final-indicator": {
-          "$ref": "#/definitions/Some ack-final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -19884,16 +27508,16 @@
     "(preload-vnf-instance-topology-operation)output": {
       "properties": {
         "VNF-API:ack-final-indicator": {
-          "$ref": "#/definitions/Some ack-final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -19946,16 +27570,16 @@
     "(preload-vnf-topology-operation)output": {
       "properties": {
         "VNF-API:ack-final-indicator": {
-          "$ref": "#/definitions/Some ack-final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -20014,13 +27638,13 @@
     "(vf-module-topology-operation)output": {
       "properties": {
         "VNF-API:ack-final-indicator": {
-          "$ref": "#/definitions/Some ack-final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-information": {
           "items": {
@@ -20029,7 +27653,7 @@
           "type": "object"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vf-module-information": {
           "items": {
@@ -20094,13 +27718,13 @@
     "(vnf-instance-topology-operation)output": {
       "properties": {
         "VNF-API:ack-final-indicator": {
-          "$ref": "#/definitions/Some ack-final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-information": {
           "items": {
@@ -20109,7 +27733,7 @@
           "type": "object"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-instance-information": {
           "items": {
@@ -20174,13 +27798,13 @@
     "(vnf-topology-operation)output": {
       "properties": {
         "VNF-API:ack-final-indicator": {
-          "$ref": "#/definitions/Some ack-final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-information": {
           "items": {
@@ -20189,7 +27813,7 @@
           "type": "object"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-information": {
           "items": {
@@ -20214,10 +27838,10 @@
     "VNF-API(config)network-information": {
       "properties": {
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-service-type": {
-          "$ref": "#/definitions/Some network-service-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -20236,23 +27860,23 @@
     "VNF-API(config)network-request-information": {
       "properties": {
         "VNF-API:aic-clli": {
-          "$ref": "#/definitions/Some aic-clli"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-type": {
-          "$ref": "#/definitions/Some network-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -20389,50 +28013,25 @@
     "VNF-API(config)request-information": {
       "properties": {
         "VNF-API:notification-url": {
-          "$ref": "#/definitions/Some notification-url"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-number": {
-          "$ref": "#/definitions/Some order-number"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-version": {
-          "$ref": "#/definitions/Some order-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-action": {
-          "$ref": "#/definitions/PreloadNetworkRequest",
-          "enum": [
-            "PreloadNetworkRequest",
-            "DeletePreloadNetworkRequest",
-            "NetworkActivateRequest",
-            "DisconnectNetworkRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "DisconnectVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "DisconnectVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-id": {
-          "$ref": "#/definitions/Some request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-sub-action": {
-          "$ref": "#/definitions/SUPP",
-          "enum": [
-            "SUPP",
-            "CANCEL"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:source": {
-          "$ref": "#/definitions/Some source"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -20451,22 +28050,13 @@
     "VNF-API(config)sdnc-request-header": {
       "properties": {
         "VNF-API:svc-action": {
-          "$ref": "#/definitions/reserve",
-          "enum": [
-            "reserve",
-            "assign",
-            "activate",
-            "delete",
-            "changeassign",
-            "changedelete",
-            "rollback"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-notification-url": {
-          "$ref": "#/definitions/Some svc-notification-url"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -20485,18 +28075,18 @@
     "VNF-API(config)service-information": {
       "properties": {
         "VNF-API:service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-instance-id": {
-          "$ref": "#/definitions/Some service-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A service instance that a VNF or a l3-network is associated with"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI subscription-service-type"
         },
         "VNF-API:subscriber-name": {
-          "$ref": "#/definitions/Some subscriber-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI global-customer-id"
         }
       },
@@ -20516,7 +28106,7 @@
     "VNF-API(config)vf-module-information": {
       "properties": {
         "VNF-API:vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         }
       },
@@ -20536,32 +28126,32 @@
     "VNF-API(config)vf-module-request-information": {
       "properties": {
         "VNF-API:aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "VNF-API:tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module id"
         },
         "VNF-API:vf-module-model-id": {
-          "$ref": "#/definitions/Some vf-module-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         },
         "VNF-API:vf-module-name": {
-          "$ref": "#/definitions/Some vf-module-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "VNF-API:vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -20636,11 +28226,11 @@
     "VNF-API(config)vnf-information": {
       "properties": {
         "VNF-API:vnf-id": {
-          "$ref": "#/definitions/Some vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "VNF-API:vnf-service-type": {
-          "$ref": "#/definitions/Some vnf-service-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -20659,7 +28249,7 @@
     "VNF-API(config)vnf-instance-information": {
       "properties": {
         "VNF-API:vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vnf-instance-id"
         }
       },
@@ -20679,23 +28269,23 @@
     "VNF-API(config)vnf-instance-request-information": {
       "properties": {
         "VNF-API:aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "VNF-API:request-version": {
-          "$ref": "#/definitions/Some request-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-networks": {
           "description": "List of vnf networks to override preload",
@@ -20783,45 +28373,41 @@
     "VNF-API(config)vnf-request-information": {
       "properties": {
         "VNF-API:aic-clli": {
-          "$ref": "#/definitions/Some aic-clli"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "VNF-API:generic-vnf-id": {
-          "$ref": "#/definitions/Some generic-vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic vnf-id"
         },
         "VNF-API:generic-vnf-name": {
-          "$ref": "#/definitions/Some generic-vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic vnf name"
         },
         "VNF-API:generic-vnf-type": {
-          "$ref": "#/definitions/Some generic-vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic vnf type"
         },
         "VNF-API:model-customization-uuid": {
-          "$ref": "#/definitions/Some model-customization-uuid",
+          "$ref": "#/definitions/Optional.empty",
           "description": "customized resource, i.e. vf-module, for use within a given service"
         },
         "VNF-API:tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:use-preload": {
-          "$ref": "#/definitions/Y",
-          "description": "orchestrate vf-module with full preload data or TOSCA lookup plus EIPAM automation",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "orchestrate vf-module with full preload data or TOSCA lookup plus EIPAM automation"
         },
         "VNF-API:vnf-id": {
-          "$ref": "#/definitions/Some vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "VNF-API:vnf-name": {
-          "$ref": "#/definitions/Some vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "VNF-API:vnf-networks": {
@@ -20832,10 +28418,10 @@
           "type": "array"
         },
         "VNF-API:vnf-request-version": {
-          "$ref": "#/definitions/Some vnf-request-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-type": {
-          "$ref": "#/definitions/Some vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         }
       },
@@ -20995,10 +28581,10 @@
     "VNF-API/network-topology-information(config)network-policy": {
       "properties": {
         "VNF-API:network-policy-fqdn": {
-          "$ref": "#/definitions/Some network-policy-fqdn"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-policy-id": {
-          "$ref": "#/definitions/Some network-policy-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21017,19 +28603,19 @@
     "VNF-API/network-topology-information(config)network-topology-identifier": {
       "properties": {
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-technology": {
-          "$ref": "#/definitions/Some network-technology"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-type": {
-          "$ref": "#/definitions/Some network-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21048,16 +28634,16 @@
     "VNF-API/network-topology-information(config)provider-network-information": {
       "properties": {
         "VNF-API:is-external-network": {
-          "$ref": "#/definitions/true"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:is-provider-network": {
-          "$ref": "#/definitions/true"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:is-shared-network": {
-          "$ref": "#/definitions/true"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:physical-network-name": {
-          "$ref": "#/definitions/Some physical-network-name"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21076,10 +28662,10 @@
     "VNF-API/network-topology-information(config)route-table-reference": {
       "properties": {
         "VNF-API:route-table-reference-fqdn": {
-          "$ref": "#/definitions/Some route-table-reference-fqdn"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:route-table-reference-id": {
-          "$ref": "#/definitions/Some route-table-reference-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21097,41 +28683,42 @@
     },
     "VNF-API/network-topology-information(config)subnets": {
       "properties": {
+        "VNF-API:addr-from-start": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Default is N"
+        },
         "VNF-API:cidr-mask": {
-          "$ref": "#/definitions/Some cidr-mask"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:dhcp-enabled": {
-          "$ref": "#/definitions/Y",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:dhcp-end-address": {
-          "$ref": "#/definitions/Some dhcp-end-address"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:dhcp-start-address": {
-          "$ref": "#/definitions/Some dhcp-start-address"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:gateway-address": {
-          "$ref": "#/definitions/8.47.8.3",
-          "enum": [
-            "8.47.8.3",
-            "5:"
-          ]
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:host-routes": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/network-topology-information/subnets(config)host-routes"
+          },
+          "type": "array"
         },
         "VNF-API:ip-version": {
-          "$ref": "#/definitions/Some ip-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:start-address": {
-          "$ref": "#/definitions/0.14.236.5%{",
-          "enum": [
-            "0.14.236.5%{",
-            "E6C9:0B:%N}p}N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21150,10 +28737,10 @@
     "VNF-API/network-topology-information(config)vpn-bindings": {
       "properties": {
         "VNF-API:global-route-target": {
-          "$ref": "#/definitions/Some global-route-target"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vpn-binding-id": {
-          "$ref": "#/definitions/Some vpn-binding-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21169,14 +28756,37 @@
       },
       "type": "object"
     },
+    "VNF-API/network-topology-information/subnets(config)host-routes": {
+      "properties": {
+        "VNF-API:next-hop": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Could be ip-address or hostname or service-instance"
+        },
+        "VNF-API:route-prefix": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/network-topology-information/subnets(config)host-routes-TOP": {
+      "properties": {
+        "VNF-API:host-routes": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/network-topology-information/subnets(config)host-routes"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/preload-vf-modules(config)vf-module-preload-list": {
       "properties": {
         "VNF-API:vf-module-model-id": {
-          "$ref": "#/definitions/Some vf-module-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         },
         "VNF-API:vf-module-name": {
-          "$ref": "#/definitions/Some vf-module-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "VNF-API:vf-module-preload-data": {
@@ -21230,62 +28840,25 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data(config)oper-status": {
       "properties": {
         "VNF-API:create-timestamp": {
-          "$ref": "#/definitions/Some create-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-action": {
-          "$ref": "#/definitions/VNFActivateRequest",
-          "enum": [
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVNFRequest",
-            "DisconnectVnfInstanceRequest",
-            "DisconnectVfModuleRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-svc-request-id": {
-          "$ref": "#/definitions/Some last-svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:maintenance-indicator": {
-          "$ref": "#/definitions/Y",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:modify-timestamp": {
-          "$ref": "#/definitions/Some modify-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21338,15 +28911,15 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information(config)vf-module-identifiers": {
       "properties": {
         "VNF-API:vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module id"
         },
         "VNF-API:vf-module-model-id": {
-          "$ref": "#/definitions/Some vf-module-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         },
         "VNF-API:vf-module-name": {
-          "$ref": "#/definitions/Some vf-module-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         }
       },
@@ -21379,7 +28952,7 @@
           "type": "array"
         },
         "VNF-API:vnf-status": {
-          "$ref": "#/definitions/Some vnf-status",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration Status from AAI - to be set by SDNC"
         },
         "VNF-API:vnf-vms": {
@@ -21405,11 +28978,11 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information(config)vnf-parameters": {
       "properties": {
         "VNF-API:vnf-parameter-name": {
-          "$ref": "#/definitions/Some vnf-parameter-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The name of an arbitrary instance-specific vnf-parameters"
         },
         "VNF-API:vnf-parameter-value": {
-          "$ref": "#/definitions/Some vnf-parameter-value",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The value of an arbitrary instance-specific vnf-parameters "
         }
       },
@@ -21429,7 +29002,7 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments(config)availability-zones": {
       "properties": {
         "VNF-API:availability-zone": {
-          "$ref": "#/definitions/Some availability-zone",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Openstack availability zone name or UUID"
         }
       },
@@ -21449,31 +29022,43 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:sriov-vlan-filter-list": {
@@ -21483,12 +29068,15 @@
           "type": "array"
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21508,7 +29096,7 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments(config)vnf-vms": {
       "properties": {
         "VNF-API:vm-count": {
-          "$ref": "#/definitions/0"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vm-names": {
           "items": {
@@ -21524,7 +29112,7 @@
           "type": "array"
         },
         "VNF-API:vm-type": {
-          "$ref": "#/definitions/Some vm-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21543,7 +29131,7 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-networks(config)sriov-vlan-filter-list": {
       "properties": {
         "VNF-API:sriov-vlan-filter": {
-          "$ref": "#/definitions/Some sriov-vlan-filter"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21562,7 +29150,13 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms(config)vm-names": {
       "properties": {
         "VNF-API:vm-name": {
-          "$ref": "#/definitions/Some vm-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -21581,15 +29175,11 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms(config)vm-networks": {
       "properties": {
         "VNF-API:floating-ip": {
-          "$ref": "#/definitions/1.17.81.2",
-          "description": "Floating ipv4 for VMs of a given type on this network",
-          "enum": [
-            "1.17.81.2",
-            "2be:"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Floating ipv4 for VMs of a given type on this network"
         },
         "VNF-API:floating-ip-v6": {
-          "$ref": "#/definitions/DECC:F:%N",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Floating ipv6 for VMs of a given type on this network"
         },
         "VNF-API:interface-route-prefixes": {
@@ -21599,9 +29189,13 @@
           "type": "array"
         },
         "VNF-API:ip-count": {
-          "$ref": "#/definitions/0",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The number of ip addresses to be assigned per vm for this network role"
         },
+        "VNF-API:ip-count-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ipv6 addresses to be assigned per vm for this network role"
+        },
         "VNF-API:network-ips": {
           "items": {
             "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips"
@@ -21621,16 +29215,16 @@
           "type": "array"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:use-dhcp": {
-          "$ref": "#/definitions/Y",
-          "description": "Indicator to use DHCP on this network for this VM",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VM"
         }
       },
       "type": "object"
@@ -21647,18 +29241,154 @@
       },
       "type": "object"
     },
+    "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names": {
+      "properties": {
+        "VNF-API:vnfc-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP": {
+      "properties": {
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks": {
+      "properties": {
+        "VNF-API:vnfc-network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP": {
+      "properties": {
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        },
+        "VNF-API:vnfc-subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments": {
+      "properties": {
+        "VNF-API:vnfc-address-family": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Subnet Version tells if this is IpV4 or IpV6"
+        },
+        "VNF-API:vnfc-subnet-dhcp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VNFC. Unless dhcp=N, we wouldnt have any address, since they would not be sdnc assigned "
+        },
+        "VNF-API:vnfc-subnet-ipcount": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ip addresses to be assigned per vnfc for this subnet role"
+        },
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips": {
+      "properties": {
+        "VNF-API:ip-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. "
+        },
+        "VNF-API:vnfc-address-ipv4": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion. "
+        },
+        "VNF-API:vnfc-address-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion."
+        },
+        "VNF-API:vnfc-client-key": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": {
       "properties": {
         "VNF-API:interface-route-prefix": {
-          "$ref": "#/definitions/0.0.1.27",
-          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
-          "enum": [
-            "0.0.1.27",
-            ":2%}"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"
         },
         "VNF-API:interface-route-prefix-cidr": {
-          "$ref": "#/definitions/Some interface-route-prefix-cidr",
+          "$ref": "#/definitions/Optional.empty",
           "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"
         }
       },
@@ -21678,12 +29408,8 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": {
       "properties": {
         "VNF-API:ip-address": {
-          "$ref": "#/definitions/27.28.9.1",
-          "description": "List of assigned ipv4 addresses on a network",
-          "enum": [
-            "27.28.9.1",
-            "179D:0aD"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "List of assigned ipv4 addresses on a network"
         }
       },
       "type": "object"
@@ -21702,7 +29428,7 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": {
       "properties": {
         "VNF-API:ip-address-ipv6": {
-          "$ref": "#/definitions/dd:",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of assigned ipv6 addresses on a network"
         }
       },
@@ -21722,7 +29448,7 @@
     "VNF-API/preload-vf-modules/vf-module-preload-list/vf-module-preload-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-macs": {
       "properties": {
         "VNF-API:mac-address": {
-          "$ref": "#/definitions/Some mac-address",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of network assignments for this VM (one per network)"
         }
       },
@@ -21742,7 +29468,7 @@
     "VNF-API/preload-vnf-instances(config)vnf-instance-preload-list": {
       "properties": {
         "VNF-API:vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vnf-instance-name, aka generic-vnf-name"
         },
         "VNF-API:vnf-instance-preload-data": {
@@ -21752,7 +29478,7 @@
           "type": "object"
         },
         "VNF-API:vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vnf-model-id, aka generic-vnf-type"
         }
       },
@@ -21800,62 +29526,25 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data(config)oper-status": {
       "properties": {
         "VNF-API:create-timestamp": {
-          "$ref": "#/definitions/Some create-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-action": {
-          "$ref": "#/definitions/VNFActivateRequest",
-          "enum": [
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVNFRequest",
-            "DisconnectVnfInstanceRequest",
-            "DisconnectVfModuleRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-svc-request-id": {
-          "$ref": "#/definitions/Some last-svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:maintenance-indicator": {
-          "$ref": "#/definitions/Y",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:modify-timestamp": {
-          "$ref": "#/definitions/Some modify-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -21914,18 +29603,18 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information(config)service-information": {
       "properties": {
         "VNF-API:service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-instance-id": {
-          "$ref": "#/definitions/Some service-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A service instance that a VNF or a l3-network is associated with"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI subscription-service-type"
         },
         "VNF-API:subscriber-name": {
-          "$ref": "#/definitions/Some subscriber-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI global-customer-id"
         }
       },
@@ -21958,7 +29647,7 @@
           "type": "array"
         },
         "VNF-API:vnf-status": {
-          "$ref": "#/definitions/Some vnf-status",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration Status from AAI - to be set by SDNC"
         },
         "VNF-API:vnf-vms": {
@@ -21984,13 +29673,13 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information(config)vnf-instance-identifiers": {
       "properties": {
         "VNF-API:vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22009,11 +29698,11 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information(config)vnf-parameters": {
       "properties": {
         "VNF-API:vnf-parameter-name": {
-          "$ref": "#/definitions/Some vnf-parameter-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The name of an arbitrary instance-specific vnf-parameters"
         },
         "VNF-API:vnf-parameter-value": {
-          "$ref": "#/definitions/Some vnf-parameter-value",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The value of an arbitrary instance-specific vnf-parameters "
         }
       },
@@ -22033,7 +29722,7 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments(config)availability-zones": {
       "properties": {
         "VNF-API:availability-zone": {
-          "$ref": "#/definitions/Some availability-zone",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Openstack availability zone name or UUID"
         }
       },
@@ -22053,31 +29742,43 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:sriov-vlan-filter-list": {
@@ -22087,12 +29788,15 @@
           "type": "array"
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22112,7 +29816,7 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments(config)vnf-vms": {
       "properties": {
         "VNF-API:vm-count": {
-          "$ref": "#/definitions/0"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vm-names": {
           "items": {
@@ -22128,7 +29832,7 @@
           "type": "array"
         },
         "VNF-API:vm-type": {
-          "$ref": "#/definitions/Some vm-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22147,7 +29851,7 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-networks(config)sriov-vlan-filter-list": {
       "properties": {
         "VNF-API:sriov-vlan-filter": {
-          "$ref": "#/definitions/Some sriov-vlan-filter"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22166,7 +29870,13 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms(config)vm-names": {
       "properties": {
         "VNF-API:vm-name": {
-          "$ref": "#/definitions/Some vm-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -22185,15 +29895,11 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms(config)vm-networks": {
       "properties": {
         "VNF-API:floating-ip": {
-          "$ref": "#/definitions/0.25.7.8%}NL",
-          "description": "Floating ipv4 for VMs of a given type on this network",
-          "enum": [
-            "0.25.7.8%}NL",
-            "9A9E:2c"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Floating ipv4 for VMs of a given type on this network"
         },
         "VNF-API:floating-ip-v6": {
-          "$ref": "#/definitions/C:b:9d",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Floating ipv6 for VMs of a given type on this network"
         },
         "VNF-API:interface-route-prefixes": {
@@ -22203,9 +29909,13 @@
           "type": "array"
         },
         "VNF-API:ip-count": {
-          "$ref": "#/definitions/0",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The number of ip addresses to be assigned per vm for this network role"
         },
+        "VNF-API:ip-count-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ipv6 addresses to be assigned per vm for this network role"
+        },
         "VNF-API:network-ips": {
           "items": {
             "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips"
@@ -22225,16 +29935,16 @@
           "type": "array"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:use-dhcp": {
-          "$ref": "#/definitions/Y",
-          "description": "Indicator to use DHCP on this network for this VM",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VM"
         }
       },
       "type": "object"
@@ -22251,18 +29961,154 @@
       },
       "type": "object"
     },
+    "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names": {
+      "properties": {
+        "VNF-API:vnfc-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP": {
+      "properties": {
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks": {
+      "properties": {
+        "VNF-API:vnfc-network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP": {
+      "properties": {
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        },
+        "VNF-API:vnfc-subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments": {
+      "properties": {
+        "VNF-API:vnfc-address-family": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Subnet Version tells if this is IpV4 or IpV6"
+        },
+        "VNF-API:vnfc-subnet-dhcp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VNFC. Unless dhcp=N, we wouldnt have any address, since they would not be sdnc assigned "
+        },
+        "VNF-API:vnfc-subnet-ipcount": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ip addresses to be assigned per vnfc for this subnet role"
+        },
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips": {
+      "properties": {
+        "VNF-API:ip-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. "
+        },
+        "VNF-API:vnfc-address-ipv4": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion. "
+        },
+        "VNF-API:vnfc-address-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion."
+        },
+        "VNF-API:vnfc-client-key": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": {
       "properties": {
         "VNF-API:interface-route-prefix": {
-          "$ref": "#/definitions/0.0.15.0",
-          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
-          "enum": [
-            "0.0.15.0",
-            "ABf6:%{}p}"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"
         },
         "VNF-API:interface-route-prefix-cidr": {
-          "$ref": "#/definitions/Some interface-route-prefix-cidr",
+          "$ref": "#/definitions/Optional.empty",
           "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"
         }
       },
@@ -22282,12 +30128,8 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": {
       "properties": {
         "VNF-API:ip-address": {
-          "$ref": "#/definitions/0.2.0.1%L",
-          "description": "List of assigned ipv4 addresses on a network",
-          "enum": [
-            "0.2.0.1%L",
-            "3E6f:1d:%{"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "List of assigned ipv4 addresses on a network"
         }
       },
       "type": "object"
@@ -22306,7 +30148,7 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": {
       "properties": {
         "VNF-API:ip-address-ipv6": {
-          "$ref": "#/definitions/5803:2",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of assigned ipv6 addresses on a network"
         }
       },
@@ -22326,7 +30168,7 @@
     "VNF-API/preload-vnf-instances/vnf-instance-preload-list/vnf-instance-preload-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-macs": {
       "properties": {
         "VNF-API:mac-address": {
-          "$ref": "#/definitions/Some mac-address",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of network assignments for this VM (one per network)"
         }
       },
@@ -22352,11 +30194,11 @@
           "type": "object"
         },
         "VNF-API:vnf-name": {
-          "$ref": "#/definitions/Some vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "VNF-API:vnf-type": {
-          "$ref": "#/definitions/Some vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         }
       },
@@ -22462,62 +30304,25 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data(config)oper-status": {
       "properties": {
         "VNF-API:create-timestamp": {
-          "$ref": "#/definitions/Some create-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-action": {
-          "$ref": "#/definitions/VNFActivateRequest",
-          "enum": [
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVNFRequest",
-            "DisconnectVnfInstanceRequest",
-            "DisconnectVfModuleRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-svc-request-id": {
-          "$ref": "#/definitions/Some last-svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:maintenance-indicator": {
-          "$ref": "#/definitions/Y",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:modify-timestamp": {
-          "$ref": "#/definitions/Some modify-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22570,10 +30375,10 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-policy": {
       "properties": {
         "VNF-API:network-policy-fqdn": {
-          "$ref": "#/definitions/Some network-policy-fqdn"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-policy-id": {
-          "$ref": "#/definitions/Some network-policy-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22592,19 +30397,19 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)network-topology-identifier": {
       "properties": {
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-technology": {
-          "$ref": "#/definitions/Some network-technology"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:network-type": {
-          "$ref": "#/definitions/Some network-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22623,16 +30428,16 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)provider-network-information": {
       "properties": {
         "VNF-API:is-external-network": {
-          "$ref": "#/definitions/true"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:is-provider-network": {
-          "$ref": "#/definitions/true"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:is-shared-network": {
-          "$ref": "#/definitions/true"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:physical-network-name": {
-          "$ref": "#/definitions/Some physical-network-name"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22651,10 +30456,10 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)route-table-reference": {
       "properties": {
         "VNF-API:route-table-reference-fqdn": {
-          "$ref": "#/definitions/Some route-table-reference-fqdn"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:route-table-reference-id": {
-          "$ref": "#/definitions/Some route-table-reference-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22672,41 +30477,42 @@
     },
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)subnets": {
       "properties": {
+        "VNF-API:addr-from-start": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Default is N"
+        },
         "VNF-API:cidr-mask": {
-          "$ref": "#/definitions/Some cidr-mask"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:dhcp-enabled": {
-          "$ref": "#/definitions/Y",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:dhcp-end-address": {
-          "$ref": "#/definitions/Some dhcp-end-address"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:dhcp-start-address": {
-          "$ref": "#/definitions/Some dhcp-start-address"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:gateway-address": {
-          "$ref": "#/definitions/0.26.0.26",
-          "enum": [
-            "0.26.0.26",
-            "fBE:"
-          ]
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:host-routes": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information/subnets(config)host-routes"
+          },
+          "type": "array"
         },
         "VNF-API:ip-version": {
-          "$ref": "#/definitions/Some ip-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:start-address": {
-          "$ref": "#/definitions/5.0.177.0%p{p",
-          "enum": [
-            "5.0.177.0%p{p",
-            "CEaF:"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22725,10 +30531,10 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information(config)vpn-bindings": {
       "properties": {
         "VNF-API:global-route-target": {
-          "$ref": "#/definitions/Some global-route-target"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vpn-binding-id": {
-          "$ref": "#/definitions/Some vpn-binding-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22744,6 +30550,29 @@
       },
       "type": "object"
     },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information/subnets(config)host-routes": {
+      "properties": {
+        "VNF-API:next-hop": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Could be ip-address or hostname or service-instance"
+        },
+        "VNF-API:route-prefix": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information/subnets(config)host-routes-TOP": {
+      "properties": {
+        "VNF-API:host-routes": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/network-topology-information/subnets(config)host-routes"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-assignments": {
       "properties": {
         "VNF-API:availability-zones": {
@@ -22760,7 +30589,7 @@
           "type": "array"
         },
         "VNF-API:vnf-status": {
-          "$ref": "#/definitions/Some vnf-status",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration Status from AAI - to be set by SDNC"
         },
         "VNF-API:vnf-vms": {
@@ -22786,11 +30615,11 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-parameters": {
       "properties": {
         "VNF-API:vnf-parameter-name": {
-          "$ref": "#/definitions/Some vnf-parameter-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The name of an arbitrary instance-specific vnf-parameters"
         },
         "VNF-API:vnf-parameter-value": {
-          "$ref": "#/definitions/Some vnf-parameter-value",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The value of an arbitrary instance-specific vnf-parameters "
         }
       },
@@ -22810,26 +30639,26 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information(config)vnf-topology-identifier": {
       "properties": {
         "VNF-API:generic-vnf-id": {
-          "$ref": "#/definitions/Some generic-vnf-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:generic-vnf-name": {
-          "$ref": "#/definitions/Some generic-vnf-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:generic-vnf-type": {
-          "$ref": "#/definitions/Some generic-vnf-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-name": {
-          "$ref": "#/definitions/Some vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "VNF-API:vnf-type": {
-          "$ref": "#/definitions/Some vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         }
       },
@@ -22849,7 +30678,7 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments(config)availability-zones": {
       "properties": {
         "VNF-API:availability-zone": {
-          "$ref": "#/definitions/Some availability-zone",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Openstack availability zone name or UUID"
         }
       },
@@ -22869,31 +30698,43 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:sriov-vlan-filter-list": {
@@ -22903,12 +30744,15 @@
           "type": "array"
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22928,7 +30772,7 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments(config)vnf-vms": {
       "properties": {
         "VNF-API:vm-count": {
-          "$ref": "#/definitions/0"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vm-names": {
           "items": {
@@ -22944,7 +30788,7 @@
           "type": "array"
         },
         "VNF-API:vm-type": {
-          "$ref": "#/definitions/Some vm-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22963,7 +30807,7 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-networks(config)sriov-vlan-filter-list": {
       "properties": {
         "VNF-API:sriov-vlan-filter": {
-          "$ref": "#/definitions/Some sriov-vlan-filter"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -22982,7 +30826,13 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms(config)vm-names": {
       "properties": {
         "VNF-API:vm-name": {
-          "$ref": "#/definitions/Some vm-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -23001,15 +30851,11 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms(config)vm-networks": {
       "properties": {
         "VNF-API:floating-ip": {
-          "$ref": "#/definitions/60.1.3.22",
-          "description": "Floating ipv4 for VMs of a given type on this network",
-          "enum": [
-            "60.1.3.22",
-            "ED93:3.38.2.25%{{p}Np{N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Floating ipv4 for VMs of a given type on this network"
         },
         "VNF-API:floating-ip-v6": {
-          "$ref": "#/definitions/dA6e:6df:",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Floating ipv6 for VMs of a given type on this network"
         },
         "VNF-API:interface-route-prefixes": {
@@ -23019,9 +30865,13 @@
           "type": "array"
         },
         "VNF-API:ip-count": {
-          "$ref": "#/definitions/0",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The number of ip addresses to be assigned per vm for this network role"
         },
+        "VNF-API:ip-count-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ipv6 addresses to be assigned per vm for this network role"
+        },
         "VNF-API:network-ips": {
           "items": {
             "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips"
@@ -23041,16 +30891,16 @@
           "type": "array"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:use-dhcp": {
-          "$ref": "#/definitions/Y",
-          "description": "Indicator to use DHCP on this network for this VM",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VM"
         }
       },
       "type": "object"
@@ -23067,18 +30917,154 @@
       },
       "type": "object"
     },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names": {
+      "properties": {
+        "VNF-API:vnfc-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP": {
+      "properties": {
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks": {
+      "properties": {
+        "VNF-API:vnfc-network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP": {
+      "properties": {
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        },
+        "VNF-API:vnfc-subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments": {
+      "properties": {
+        "VNF-API:vnfc-address-family": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Subnet Version tells if this is IpV4 or IpV6"
+        },
+        "VNF-API:vnfc-subnet-dhcp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VNFC. Unless dhcp=N, we wouldnt have any address, since they would not be sdnc assigned "
+        },
+        "VNF-API:vnfc-subnet-ipcount": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ip addresses to be assigned per vnfc for this subnet role"
+        },
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips": {
+      "properties": {
+        "VNF-API:ip-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. "
+        },
+        "VNF-API:vnfc-address-ipv4": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion. "
+        },
+        "VNF-API:vnfc-address-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion."
+        },
+        "VNF-API:vnfc-client-key": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": {
       "properties": {
         "VNF-API:interface-route-prefix": {
-          "$ref": "#/definitions/0.0.27.0%NpN}",
-          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
-          "enum": [
-            "0.0.27.0%NpN}",
-            "7F6D:%{"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"
         },
         "VNF-API:interface-route-prefix-cidr": {
-          "$ref": "#/definitions/Some interface-route-prefix-cidr",
+          "$ref": "#/definitions/Optional.empty",
           "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"
         }
       },
@@ -23098,12 +31084,8 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": {
       "properties": {
         "VNF-API:ip-address": {
-          "$ref": "#/definitions/1.1.2.4%}{",
-          "description": "List of assigned ipv4 addresses on a network",
-          "enum": [
-            "1.1.2.4%}{",
-            "D4A:B"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "List of assigned ipv4 addresses on a network"
         }
       },
       "type": "object"
@@ -23122,7 +31104,7 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": {
       "properties": {
         "VNF-API:ip-address-ipv6": {
-          "$ref": "#/definitions/e02A:2",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of assigned ipv6 addresses on a network"
         }
       },
@@ -23142,7 +31124,7 @@
     "VNF-API/preload-vnfs/vnf-preload-list/preload-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-macs": {
       "properties": {
         "VNF-API:mac-address": {
-          "$ref": "#/definitions/Some mac-address",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of network assignments for this VM (one per network)"
         }
       },
@@ -23162,15 +31144,15 @@
     "VNF-API/vf-module-topology-information(config)vf-module-identifiers": {
       "properties": {
         "VNF-API:vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module id"
         },
         "VNF-API:vf-module-model-id": {
-          "$ref": "#/definitions/Some vf-module-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         },
         "VNF-API:vf-module-name": {
-          "$ref": "#/definitions/Some vf-module-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         }
       },
@@ -23203,7 +31185,7 @@
           "type": "array"
         },
         "VNF-API:vnf-status": {
-          "$ref": "#/definitions/Some vnf-status",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration Status from AAI - to be set by SDNC"
         },
         "VNF-API:vnf-vms": {
@@ -23229,11 +31211,11 @@
     "VNF-API/vf-module-topology-information(config)vnf-parameters": {
       "properties": {
         "VNF-API:vnf-parameter-name": {
-          "$ref": "#/definitions/Some vnf-parameter-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The name of an arbitrary instance-specific vnf-parameters"
         },
         "VNF-API:vnf-parameter-value": {
-          "$ref": "#/definitions/Some vnf-parameter-value",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The value of an arbitrary instance-specific vnf-parameters "
         }
       },
@@ -23253,7 +31235,7 @@
     "VNF-API/vf-module-topology-information/vnf-assignments(config)availability-zones": {
       "properties": {
         "VNF-API:availability-zone": {
-          "$ref": "#/definitions/Some availability-zone",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Openstack availability zone name or UUID"
         }
       },
@@ -23273,31 +31255,43 @@
     "VNF-API/vf-module-topology-information/vnf-assignments(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:sriov-vlan-filter-list": {
@@ -23307,12 +31301,15 @@
           "type": "array"
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -23332,7 +31329,7 @@
     "VNF-API/vf-module-topology-information/vnf-assignments(config)vnf-vms": {
       "properties": {
         "VNF-API:vm-count": {
-          "$ref": "#/definitions/0"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vm-names": {
           "items": {
@@ -23348,7 +31345,7 @@
           "type": "array"
         },
         "VNF-API:vm-type": {
-          "$ref": "#/definitions/Some vm-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -23367,7 +31364,7 @@
     "VNF-API/vf-module-topology-information/vnf-assignments/vnf-networks(config)sriov-vlan-filter-list": {
       "properties": {
         "VNF-API:sriov-vlan-filter": {
-          "$ref": "#/definitions/Some sriov-vlan-filter"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -23386,7 +31383,13 @@
     "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms(config)vm-names": {
       "properties": {
         "VNF-API:vm-name": {
-          "$ref": "#/definitions/Some vm-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -23405,15 +31408,11 @@
     "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms(config)vm-networks": {
       "properties": {
         "VNF-API:floating-ip": {
-          "$ref": "#/definitions/0.2.7.0",
-          "description": "Floating ipv4 for VMs of a given type on this network",
-          "enum": [
-            "0.2.7.0",
-            "A:"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Floating ipv4 for VMs of a given type on this network"
         },
         "VNF-API:floating-ip-v6": {
-          "$ref": "#/definitions/af:",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Floating ipv6 for VMs of a given type on this network"
         },
         "VNF-API:interface-route-prefixes": {
@@ -23423,9 +31422,13 @@
           "type": "array"
         },
         "VNF-API:ip-count": {
-          "$ref": "#/definitions/0",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The number of ip addresses to be assigned per vm for this network role"
         },
+        "VNF-API:ip-count-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ipv6 addresses to be assigned per vm for this network role"
+        },
         "VNF-API:network-ips": {
           "items": {
             "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips"
@@ -23445,16 +31448,16 @@
           "type": "array"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:use-dhcp": {
-          "$ref": "#/definitions/Y",
-          "description": "Indicator to use DHCP on this network for this VM",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VM"
         }
       },
       "type": "object"
@@ -23471,18 +31474,154 @@
       },
       "type": "object"
     },
+    "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names": {
+      "properties": {
+        "VNF-API:vnfc-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP": {
+      "properties": {
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks": {
+      "properties": {
+        "VNF-API:vnfc-network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP": {
+      "properties": {
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        },
+        "VNF-API:vnfc-subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments": {
+      "properties": {
+        "VNF-API:vnfc-address-family": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Subnet Version tells if this is IpV4 or IpV6"
+        },
+        "VNF-API:vnfc-subnet-dhcp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VNFC. Unless dhcp=N, we wouldnt have any address, since they would not be sdnc assigned "
+        },
+        "VNF-API:vnfc-subnet-ipcount": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ip addresses to be assigned per vnfc for this subnet role"
+        },
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips": {
+      "properties": {
+        "VNF-API:ip-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. "
+        },
+        "VNF-API:vnfc-address-ipv4": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion. "
+        },
+        "VNF-API:vnfc-address-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion."
+        },
+        "VNF-API:vnfc-client-key": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": {
       "properties": {
         "VNF-API:interface-route-prefix": {
-          "$ref": "#/definitions/0.0.9.252%{",
-          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
-          "enum": [
-            "0.0.9.252%{",
-            "1D:34.26.165.168%pN"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"
         },
         "VNF-API:interface-route-prefix-cidr": {
-          "$ref": "#/definitions/Some interface-route-prefix-cidr",
+          "$ref": "#/definitions/Optional.empty",
           "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"
         }
       },
@@ -23502,12 +31641,8 @@
     "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": {
       "properties": {
         "VNF-API:ip-address": {
-          "$ref": "#/definitions/0.0.3.2",
-          "description": "List of assigned ipv4 addresses on a network",
-          "enum": [
-            "0.0.3.2",
-            "Bc:::11%{"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "List of assigned ipv4 addresses on a network"
         }
       },
       "type": "object"
@@ -23526,7 +31661,7 @@
     "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": {
       "properties": {
         "VNF-API:ip-address-ipv6": {
-          "$ref": "#/definitions/60D:",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of assigned ipv6 addresses on a network"
         }
       },
@@ -23546,7 +31681,7 @@
     "VNF-API/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-macs": {
       "properties": {
         "VNF-API:mac-address": {
-          "$ref": "#/definitions/Some mac-address",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of network assignments for this VM (one per network)"
         }
       },
@@ -23572,7 +31707,7 @@
           "type": "object"
         },
         "VNF-API:vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "VNF-API:vf-module-service-data": {
@@ -23601,78 +31736,31 @@
     "VNF-API/vf-modules/vf-module-list(config)service-status": {
       "properties": {
         "VNF-API:final-indicator": {
-          "$ref": "#/definitions/Some final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-status": {
-          "$ref": "#/definitions/synccomplete",
-          "enum": [
-            "synccomplete",
-            "asynccomplete",
-            "notifycomplete"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-timestamp": {
-          "$ref": "#/definitions/Some response-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:rpc-action": {
-          "$ref": "#/definitions/reserve",
-          "enum": [
-            "reserve",
-            "assign",
-            "activate",
-            "delete",
-            "changeassign",
-            "changedelete",
-            "rollback"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:rpc-name": {
-          "$ref": "#/definitions/vnf-topology-operation",
-          "enum": [
-            "vnf-topology-operation",
-            "preload-vnf-topology-operation",
-            "vnf-instance-topology-operation",
-            "preload-vnf-instance-topology-operation",
-            "vf-module-topology-operation",
-            "preload-vf-module-topology-operation"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnfsdn-action": {
-          "$ref": "#/definitions/PreloadNetworkRequest",
-          "enum": [
-            "PreloadNetworkRequest",
-            "DeletePreloadNetworkRequest",
-            "NetworkActivateRequest",
-            "DisconnectNetworkRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "DisconnectVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "DisconnectVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnfsdn-subaction": {
-          "$ref": "#/definitions/SUPP",
-          "enum": [
-            "SUPP",
-            "CANCEL"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -23715,7 +31803,7 @@
           "type": "object"
         },
         "VNF-API:vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "VNF-API:vf-module-request-information": {
@@ -23747,62 +31835,25 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data(config)oper-status": {
       "properties": {
         "VNF-API:create-timestamp": {
-          "$ref": "#/definitions/Some create-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-action": {
-          "$ref": "#/definitions/VNFActivateRequest",
-          "enum": [
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVNFRequest",
-            "DisconnectVnfInstanceRequest",
-            "DisconnectVfModuleRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-svc-request-id": {
-          "$ref": "#/definitions/Some last-svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:maintenance-indicator": {
-          "$ref": "#/definitions/Y",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:modify-timestamp": {
-          "$ref": "#/definitions/Some modify-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -23821,50 +31872,25 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data(config)request-information": {
       "properties": {
         "VNF-API:notification-url": {
-          "$ref": "#/definitions/Some notification-url"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-number": {
-          "$ref": "#/definitions/Some order-number"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-version": {
-          "$ref": "#/definitions/Some order-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-action": {
-          "$ref": "#/definitions/PreloadNetworkRequest",
-          "enum": [
-            "PreloadNetworkRequest",
-            "DeletePreloadNetworkRequest",
-            "NetworkActivateRequest",
-            "DisconnectNetworkRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "DisconnectVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "DisconnectVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-id": {
-          "$ref": "#/definitions/Some request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-sub-action": {
-          "$ref": "#/definitions/SUPP",
-          "enum": [
-            "SUPP",
-            "CANCEL"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:source": {
-          "$ref": "#/definitions/Some source"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -23883,22 +31909,13 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data(config)sdnc-request-header": {
       "properties": {
         "VNF-API:svc-action": {
-          "$ref": "#/definitions/reserve",
-          "enum": [
-            "reserve",
-            "assign",
-            "activate",
-            "delete",
-            "changeassign",
-            "changedelete",
-            "rollback"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-notification-url": {
-          "$ref": "#/definitions/Some svc-notification-url"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -23917,18 +31934,18 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data(config)service-information": {
       "properties": {
         "VNF-API:service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-instance-id": {
-          "$ref": "#/definitions/Some service-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A service instance that a VNF or a l3-network is associated with"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI subscription-service-type"
         },
         "VNF-API:subscriber-name": {
-          "$ref": "#/definitions/Some subscriber-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI global-customer-id"
         }
       },
@@ -23948,32 +31965,32 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data(config)vf-module-request-information": {
       "properties": {
         "VNF-API:aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "VNF-API:tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module id"
         },
         "VNF-API:vf-module-model-id": {
-          "$ref": "#/definitions/Some vf-module-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         },
         "VNF-API:vf-module-name": {
-          "$ref": "#/definitions/Some vf-module-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "VNF-API:vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -24026,15 +32043,15 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information(config)vf-module-identifiers": {
       "properties": {
         "VNF-API:vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module id"
         },
         "VNF-API:vf-module-model-id": {
-          "$ref": "#/definitions/Some vf-module-model-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         },
         "VNF-API:vf-module-name": {
-          "$ref": "#/definitions/Some vf-module-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         }
       },
@@ -24067,7 +32084,7 @@
           "type": "array"
         },
         "VNF-API:vnf-status": {
-          "$ref": "#/definitions/Some vnf-status",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration Status from AAI - to be set by SDNC"
         },
         "VNF-API:vnf-vms": {
@@ -24093,11 +32110,11 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information(config)vnf-parameters": {
       "properties": {
         "VNF-API:vnf-parameter-name": {
-          "$ref": "#/definitions/Some vnf-parameter-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The name of an arbitrary instance-specific vnf-parameters"
         },
         "VNF-API:vnf-parameter-value": {
-          "$ref": "#/definitions/Some vnf-parameter-value",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The value of an arbitrary instance-specific vnf-parameters "
         }
       },
@@ -24117,7 +32134,7 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments(config)availability-zones": {
       "properties": {
         "VNF-API:availability-zone": {
-          "$ref": "#/definitions/Some availability-zone",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Openstack availability zone name or UUID"
         }
       },
@@ -24137,31 +32154,43 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:sriov-vlan-filter-list": {
@@ -24171,12 +32200,15 @@
           "type": "array"
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -24196,7 +32228,7 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments(config)vnf-vms": {
       "properties": {
         "VNF-API:vm-count": {
-          "$ref": "#/definitions/0"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vm-names": {
           "items": {
@@ -24212,7 +32244,7 @@
           "type": "array"
         },
         "VNF-API:vm-type": {
-          "$ref": "#/definitions/Some vm-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -24231,7 +32263,7 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-networks(config)sriov-vlan-filter-list": {
       "properties": {
         "VNF-API:sriov-vlan-filter": {
-          "$ref": "#/definitions/Some sriov-vlan-filter"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -24250,7 +32282,13 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms(config)vm-names": {
       "properties": {
         "VNF-API:vm-name": {
-          "$ref": "#/definitions/Some vm-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -24269,15 +32307,11 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms(config)vm-networks": {
       "properties": {
         "VNF-API:floating-ip": {
-          "$ref": "#/definitions/0.1.192.1%p{N",
-          "description": "Floating ipv4 for VMs of a given type on this network",
-          "enum": [
-            "0.1.192.1%p{N",
-            "0F:cBcC%N{}{p"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Floating ipv4 for VMs of a given type on this network"
         },
         "VNF-API:floating-ip-v6": {
-          "$ref": "#/definitions/CD42:0::",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Floating ipv6 for VMs of a given type on this network"
         },
         "VNF-API:interface-route-prefixes": {
@@ -24287,9 +32321,13 @@
           "type": "array"
         },
         "VNF-API:ip-count": {
-          "$ref": "#/definitions/0",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The number of ip addresses to be assigned per vm for this network role"
         },
+        "VNF-API:ip-count-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ipv6 addresses to be assigned per vm for this network role"
+        },
         "VNF-API:network-ips": {
           "items": {
             "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips"
@@ -24309,16 +32347,16 @@
           "type": "array"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:use-dhcp": {
-          "$ref": "#/definitions/Y",
-          "description": "Indicator to use DHCP on this network for this VM",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VM"
         }
       },
       "type": "object"
@@ -24335,18 +32373,154 @@
       },
       "type": "object"
     },
+    "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names": {
+      "properties": {
+        "VNF-API:vnfc-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP": {
+      "properties": {
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks": {
+      "properties": {
+        "VNF-API:vnfc-network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP": {
+      "properties": {
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        },
+        "VNF-API:vnfc-subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments": {
+      "properties": {
+        "VNF-API:vnfc-address-family": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Subnet Version tells if this is IpV4 or IpV6"
+        },
+        "VNF-API:vnfc-subnet-dhcp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VNFC. Unless dhcp=N, we wouldnt have any address, since they would not be sdnc assigned "
+        },
+        "VNF-API:vnfc-subnet-ipcount": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ip addresses to be assigned per vnfc for this subnet role"
+        },
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips": {
+      "properties": {
+        "VNF-API:ip-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. "
+        },
+        "VNF-API:vnfc-address-ipv4": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion. "
+        },
+        "VNF-API:vnfc-address-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion."
+        },
+        "VNF-API:vnfc-client-key": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": {
       "properties": {
         "VNF-API:interface-route-prefix": {
-          "$ref": "#/definitions/27.102.66.23%p",
-          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
-          "enum": [
-            "27.102.66.23%p",
-            "406B:C%NN"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"
         },
         "VNF-API:interface-route-prefix-cidr": {
-          "$ref": "#/definitions/Some interface-route-prefix-cidr",
+          "$ref": "#/definitions/Optional.empty",
           "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"
         }
       },
@@ -24366,12 +32540,8 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": {
       "properties": {
         "VNF-API:ip-address": {
-          "$ref": "#/definitions/21.7.145.1",
-          "description": "List of assigned ipv4 addresses on a network",
-          "enum": [
-            "21.7.145.1",
-            "b1:"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "List of assigned ipv4 addresses on a network"
         }
       },
       "type": "object"
@@ -24390,7 +32560,7 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": {
       "properties": {
         "VNF-API:ip-address-ipv6": {
-          "$ref": "#/definitions/f:",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of assigned ipv6 addresses on a network"
         }
       },
@@ -24410,7 +32580,7 @@
     "VNF-API/vf-modules/vf-module-list/vf-module-service-data/vf-module-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-macs": {
       "properties": {
         "VNF-API:mac-address": {
-          "$ref": "#/definitions/Some mac-address",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of network assignments for this VM (one per network)"
         }
       },
@@ -24430,40 +32600,55 @@
     "VNF-API/vnf-instance-request-information(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -24483,18 +32668,18 @@
     "VNF-API/vnf-instance-topology-information(config)service-information": {
       "properties": {
         "VNF-API:service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-instance-id": {
-          "$ref": "#/definitions/Some service-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A service instance that a VNF or a l3-network is associated with"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI subscription-service-type"
         },
         "VNF-API:subscriber-name": {
-          "$ref": "#/definitions/Some subscriber-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI global-customer-id"
         }
       },
@@ -24527,7 +32712,7 @@
           "type": "array"
         },
         "VNF-API:vnf-status": {
-          "$ref": "#/definitions/Some vnf-status",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration Status from AAI - to be set by SDNC"
         },
         "VNF-API:vnf-vms": {
@@ -24553,13 +32738,13 @@
     "VNF-API/vnf-instance-topology-information(config)vnf-instance-identifiers": {
       "properties": {
         "VNF-API:vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -24578,11 +32763,11 @@
     "VNF-API/vnf-instance-topology-information(config)vnf-parameters": {
       "properties": {
         "VNF-API:vnf-parameter-name": {
-          "$ref": "#/definitions/Some vnf-parameter-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The name of an arbitrary instance-specific vnf-parameters"
         },
         "VNF-API:vnf-parameter-value": {
-          "$ref": "#/definitions/Some vnf-parameter-value",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The value of an arbitrary instance-specific vnf-parameters "
         }
       },
@@ -24602,7 +32787,7 @@
     "VNF-API/vnf-instance-topology-information/vnf-assignments(config)availability-zones": {
       "properties": {
         "VNF-API:availability-zone": {
-          "$ref": "#/definitions/Some availability-zone",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Openstack availability zone name or UUID"
         }
       },
@@ -24622,31 +32807,43 @@
     "VNF-API/vnf-instance-topology-information/vnf-assignments(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:sriov-vlan-filter-list": {
@@ -24656,12 +32853,15 @@
           "type": "array"
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -24681,7 +32881,7 @@
     "VNF-API/vnf-instance-topology-information/vnf-assignments(config)vnf-vms": {
       "properties": {
         "VNF-API:vm-count": {
-          "$ref": "#/definitions/0"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vm-names": {
           "items": {
@@ -24697,7 +32897,7 @@
           "type": "array"
         },
         "VNF-API:vm-type": {
-          "$ref": "#/definitions/Some vm-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -24716,7 +32916,7 @@
     "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-networks(config)sriov-vlan-filter-list": {
       "properties": {
         "VNF-API:sriov-vlan-filter": {
-          "$ref": "#/definitions/Some sriov-vlan-filter"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -24735,7 +32935,13 @@
     "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms(config)vm-names": {
       "properties": {
         "VNF-API:vm-name": {
-          "$ref": "#/definitions/Some vm-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -24754,15 +32960,11 @@
     "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms(config)vm-networks": {
       "properties": {
         "VNF-API:floating-ip": {
-          "$ref": "#/definitions/1.16.251.165%LNp",
-          "description": "Floating ipv4 for VMs of a given type on this network",
-          "enum": [
-            "1.16.251.165%LNp",
-            "46:4"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Floating ipv4 for VMs of a given type on this network"
         },
         "VNF-API:floating-ip-v6": {
-          "$ref": "#/definitions/bd65:",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Floating ipv6 for VMs of a given type on this network"
         },
         "VNF-API:interface-route-prefixes": {
@@ -24772,9 +32974,13 @@
           "type": "array"
         },
         "VNF-API:ip-count": {
-          "$ref": "#/definitions/0",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The number of ip addresses to be assigned per vm for this network role"
         },
+        "VNF-API:ip-count-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ipv6 addresses to be assigned per vm for this network role"
+        },
         "VNF-API:network-ips": {
           "items": {
             "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips"
@@ -24794,16 +33000,16 @@
           "type": "array"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:use-dhcp": {
-          "$ref": "#/definitions/Y",
-          "description": "Indicator to use DHCP on this network for this VM",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VM"
         }
       },
       "type": "object"
@@ -24820,18 +33026,154 @@
       },
       "type": "object"
     },
+    "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names": {
+      "properties": {
+        "VNF-API:vnfc-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP": {
+      "properties": {
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks": {
+      "properties": {
+        "VNF-API:vnfc-network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP": {
+      "properties": {
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        },
+        "VNF-API:vnfc-subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments": {
+      "properties": {
+        "VNF-API:vnfc-address-family": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Subnet Version tells if this is IpV4 or IpV6"
+        },
+        "VNF-API:vnfc-subnet-dhcp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VNFC. Unless dhcp=N, we wouldnt have any address, since they would not be sdnc assigned "
+        },
+        "VNF-API:vnfc-subnet-ipcount": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ip addresses to be assigned per vnfc for this subnet role"
+        },
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips": {
+      "properties": {
+        "VNF-API:ip-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. "
+        },
+        "VNF-API:vnfc-address-ipv4": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion. "
+        },
+        "VNF-API:vnfc-address-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion."
+        },
+        "VNF-API:vnfc-client-key": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": {
       "properties": {
         "VNF-API:interface-route-prefix": {
-          "$ref": "#/definitions/242.229.12.0%p",
-          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
-          "enum": [
-            "242.229.12.0%p",
-            "E312:D"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"
         },
         "VNF-API:interface-route-prefix-cidr": {
-          "$ref": "#/definitions/Some interface-route-prefix-cidr",
+          "$ref": "#/definitions/Optional.empty",
           "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"
         }
       },
@@ -24851,12 +33193,8 @@
     "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": {
       "properties": {
         "VNF-API:ip-address": {
-          "$ref": "#/definitions/25.1.1.2%}",
-          "description": "List of assigned ipv4 addresses on a network",
-          "enum": [
-            "25.1.1.2%}",
-            "d:25:bF:9%L}{"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "List of assigned ipv4 addresses on a network"
         }
       },
       "type": "object"
@@ -24875,7 +33213,7 @@
     "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": {
       "properties": {
         "VNF-API:ip-address-ipv6": {
-          "$ref": "#/definitions/Ed::1fC",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of assigned ipv6 addresses on a network"
         }
       },
@@ -24895,7 +33233,7 @@
     "VNF-API/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-macs": {
       "properties": {
         "VNF-API:mac-address": {
-          "$ref": "#/definitions/Some mac-address",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of network assignments for this VM (one per network)"
         }
       },
@@ -24921,7 +33259,7 @@
           "type": "object"
         },
         "VNF-API:vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic-vnf-id"
         },
         "VNF-API:vnf-instance-service-data": {
@@ -24950,78 +33288,31 @@
     "VNF-API/vnf-instances/vnf-instance-list(config)service-status": {
       "properties": {
         "VNF-API:final-indicator": {
-          "$ref": "#/definitions/Some final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-status": {
-          "$ref": "#/definitions/synccomplete",
-          "enum": [
-            "synccomplete",
-            "asynccomplete",
-            "notifycomplete"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-timestamp": {
-          "$ref": "#/definitions/Some response-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:rpc-action": {
-          "$ref": "#/definitions/reserve",
-          "enum": [
-            "reserve",
-            "assign",
-            "activate",
-            "delete",
-            "changeassign",
-            "changedelete",
-            "rollback"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:rpc-name": {
-          "$ref": "#/definitions/vnf-topology-operation",
-          "enum": [
-            "vnf-topology-operation",
-            "preload-vnf-topology-operation",
-            "vnf-instance-topology-operation",
-            "preload-vnf-instance-topology-operation",
-            "vf-module-topology-operation",
-            "preload-vf-module-topology-operation"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnfsdn-action": {
-          "$ref": "#/definitions/PreloadNetworkRequest",
-          "enum": [
-            "PreloadNetworkRequest",
-            "DeletePreloadNetworkRequest",
-            "NetworkActivateRequest",
-            "DisconnectNetworkRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "DisconnectVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "DisconnectVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnfsdn-subaction": {
-          "$ref": "#/definitions/SUPP",
-          "enum": [
-            "SUPP",
-            "CANCEL"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -25070,7 +33361,7 @@
           "type": "array"
         },
         "VNF-API:vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vnf-instance-id"
         },
         "VNF-API:vnf-instance-request-information": {
@@ -25102,62 +33393,25 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data(config)oper-status": {
       "properties": {
         "VNF-API:create-timestamp": {
-          "$ref": "#/definitions/Some create-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-action": {
-          "$ref": "#/definitions/VNFActivateRequest",
-          "enum": [
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVNFRequest",
-            "DisconnectVnfInstanceRequest",
-            "DisconnectVfModuleRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-svc-request-id": {
-          "$ref": "#/definitions/Some last-svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:maintenance-indicator": {
-          "$ref": "#/definitions/Y",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:modify-timestamp": {
-          "$ref": "#/definitions/Some modify-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -25176,50 +33430,25 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data(config)request-information": {
       "properties": {
         "VNF-API:notification-url": {
-          "$ref": "#/definitions/Some notification-url"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-number": {
-          "$ref": "#/definitions/Some order-number"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-version": {
-          "$ref": "#/definitions/Some order-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-action": {
-          "$ref": "#/definitions/PreloadNetworkRequest",
-          "enum": [
-            "PreloadNetworkRequest",
-            "DeletePreloadNetworkRequest",
-            "NetworkActivateRequest",
-            "DisconnectNetworkRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "DisconnectVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "DisconnectVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-id": {
-          "$ref": "#/definitions/Some request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-sub-action": {
-          "$ref": "#/definitions/SUPP",
-          "enum": [
-            "SUPP",
-            "CANCEL"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:source": {
-          "$ref": "#/definitions/Some source"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -25238,22 +33467,13 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data(config)sdnc-request-header": {
       "properties": {
         "VNF-API:svc-action": {
-          "$ref": "#/definitions/reserve",
-          "enum": [
-            "reserve",
-            "assign",
-            "activate",
-            "delete",
-            "changeassign",
-            "changedelete",
-            "rollback"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-notification-url": {
-          "$ref": "#/definitions/Some svc-notification-url"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -25272,18 +33492,18 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data(config)service-information": {
       "properties": {
         "VNF-API:service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-instance-id": {
-          "$ref": "#/definitions/Some service-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A service instance that a VNF or a l3-network is associated with"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI subscription-service-type"
         },
         "VNF-API:subscriber-name": {
-          "$ref": "#/definitions/Some subscriber-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI global-customer-id"
         }
       },
@@ -25303,7 +33523,7 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data(config)vf-module-relationship-list": {
       "properties": {
         "VNF-API:vf-module-id": {
-          "$ref": "#/definitions/Some vf-module-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         }
       },
@@ -25323,23 +33543,23 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data(config)vnf-instance-request-information": {
       "properties": {
         "VNF-API:aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "VNF-API:request-version": {
-          "$ref": "#/definitions/Some request-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-networks": {
           "description": "List of vnf networks to override preload",
@@ -25405,40 +33625,55 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-request-information(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -25458,18 +33693,18 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information(config)service-information": {
       "properties": {
         "VNF-API:service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-instance-id": {
-          "$ref": "#/definitions/Some service-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A service instance that a VNF or a l3-network is associated with"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI subscription-service-type"
         },
         "VNF-API:subscriber-name": {
-          "$ref": "#/definitions/Some subscriber-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI global-customer-id"
         }
       },
@@ -25502,7 +33737,7 @@
           "type": "array"
         },
         "VNF-API:vnf-status": {
-          "$ref": "#/definitions/Some vnf-status",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration Status from AAI - to be set by SDNC"
         },
         "VNF-API:vnf-vms": {
@@ -25528,13 +33763,13 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information(config)vnf-instance-identifiers": {
       "properties": {
         "VNF-API:vnf-instance-id": {
-          "$ref": "#/definitions/Some vnf-instance-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-instance-name": {
-          "$ref": "#/definitions/Some vnf-instance-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-model-id": {
-          "$ref": "#/definitions/Some vnf-model-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -25553,11 +33788,11 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information(config)vnf-parameters": {
       "properties": {
         "VNF-API:vnf-parameter-name": {
-          "$ref": "#/definitions/Some vnf-parameter-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The name of an arbitrary instance-specific vnf-parameters"
         },
         "VNF-API:vnf-parameter-value": {
-          "$ref": "#/definitions/Some vnf-parameter-value",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The value of an arbitrary instance-specific vnf-parameters "
         }
       },
@@ -25577,7 +33812,7 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments(config)availability-zones": {
       "properties": {
         "VNF-API:availability-zone": {
-          "$ref": "#/definitions/Some availability-zone",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Openstack availability zone name or UUID"
         }
       },
@@ -25597,31 +33832,43 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:sriov-vlan-filter-list": {
@@ -25631,12 +33878,15 @@
           "type": "array"
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -25656,7 +33906,7 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments(config)vnf-vms": {
       "properties": {
         "VNF-API:vm-count": {
-          "$ref": "#/definitions/0"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vm-names": {
           "items": {
@@ -25672,7 +33922,7 @@
           "type": "array"
         },
         "VNF-API:vm-type": {
-          "$ref": "#/definitions/Some vm-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -25691,7 +33941,7 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-networks(config)sriov-vlan-filter-list": {
       "properties": {
         "VNF-API:sriov-vlan-filter": {
-          "$ref": "#/definitions/Some sriov-vlan-filter"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -25710,7 +33960,13 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms(config)vm-names": {
       "properties": {
         "VNF-API:vm-name": {
-          "$ref": "#/definitions/Some vm-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -25729,15 +33985,11 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms(config)vm-networks": {
       "properties": {
         "VNF-API:floating-ip": {
-          "$ref": "#/definitions/0.52.1.4",
-          "description": "Floating ipv4 for VMs of a given type on this network",
-          "enum": [
-            "0.52.1.4",
-            ":ae%p}L}{"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Floating ipv4 for VMs of a given type on this network"
         },
         "VNF-API:floating-ip-v6": {
-          "$ref": "#/definitions/2BF:2AeA",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Floating ipv6 for VMs of a given type on this network"
         },
         "VNF-API:interface-route-prefixes": {
@@ -25747,9 +33999,13 @@
           "type": "array"
         },
         "VNF-API:ip-count": {
-          "$ref": "#/definitions/0",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The number of ip addresses to be assigned per vm for this network role"
         },
+        "VNF-API:ip-count-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ipv6 addresses to be assigned per vm for this network role"
+        },
         "VNF-API:network-ips": {
           "items": {
             "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips"
@@ -25769,16 +34025,16 @@
           "type": "array"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:use-dhcp": {
-          "$ref": "#/definitions/Y",
-          "description": "Indicator to use DHCP on this network for this VM",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VM"
         }
       },
       "type": "object"
@@ -25795,18 +34051,154 @@
       },
       "type": "object"
     },
+    "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names": {
+      "properties": {
+        "VNF-API:vnfc-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP": {
+      "properties": {
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks": {
+      "properties": {
+        "VNF-API:vnfc-network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP": {
+      "properties": {
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        },
+        "VNF-API:vnfc-subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments": {
+      "properties": {
+        "VNF-API:vnfc-address-family": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Subnet Version tells if this is IpV4 or IpV6"
+        },
+        "VNF-API:vnfc-subnet-dhcp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VNFC. Unless dhcp=N, we wouldnt have any address, since they would not be sdnc assigned "
+        },
+        "VNF-API:vnfc-subnet-ipcount": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ip addresses to be assigned per vnfc for this subnet role"
+        },
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips": {
+      "properties": {
+        "VNF-API:ip-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. "
+        },
+        "VNF-API:vnfc-address-ipv4": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion. "
+        },
+        "VNF-API:vnfc-address-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion."
+        },
+        "VNF-API:vnfc-client-key": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": {
       "properties": {
         "VNF-API:interface-route-prefix": {
-          "$ref": "#/definitions/1.71.0.15",
-          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
-          "enum": [
-            "1.71.0.15",
-            "1:E"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"
         },
         "VNF-API:interface-route-prefix-cidr": {
-          "$ref": "#/definitions/Some interface-route-prefix-cidr",
+          "$ref": "#/definitions/Optional.empty",
           "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"
         }
       },
@@ -25826,12 +34218,8 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": {
       "properties": {
         "VNF-API:ip-address": {
-          "$ref": "#/definitions/13.8.0.1%L{}N{p}}LLp",
-          "description": "List of assigned ipv4 addresses on a network",
-          "enum": [
-            "13.8.0.1%L{}N{p}}LLp",
-            "Add:"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "List of assigned ipv4 addresses on a network"
         }
       },
       "type": "object"
@@ -25850,7 +34238,7 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": {
       "properties": {
         "VNF-API:ip-address-ipv6": {
-          "$ref": "#/definitions/:f0:",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of assigned ipv6 addresses on a network"
         }
       },
@@ -25870,7 +34258,7 @@
     "VNF-API/vnf-instances/vnf-instance-list/vnf-instance-service-data/vnf-instance-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-macs": {
       "properties": {
         "VNF-API:mac-address": {
-          "$ref": "#/definitions/Some mac-address",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of network assignments for this VM (one per network)"
         }
       },
@@ -25890,40 +34278,55 @@
     "VNF-API/vnf-request-information(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -25956,7 +34359,7 @@
           "type": "array"
         },
         "VNF-API:vnf-status": {
-          "$ref": "#/definitions/Some vnf-status",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration Status from AAI - to be set by SDNC"
         },
         "VNF-API:vnf-vms": {
@@ -25982,11 +34385,11 @@
     "VNF-API/vnf-topology-information(config)vnf-parameters": {
       "properties": {
         "VNF-API:vnf-parameter-name": {
-          "$ref": "#/definitions/Some vnf-parameter-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The name of an arbitrary instance-specific vnf-parameters"
         },
         "VNF-API:vnf-parameter-value": {
-          "$ref": "#/definitions/Some vnf-parameter-value",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The value of an arbitrary instance-specific vnf-parameters "
         }
       },
@@ -26006,26 +34409,26 @@
     "VNF-API/vnf-topology-information(config)vnf-topology-identifier": {
       "properties": {
         "VNF-API:generic-vnf-id": {
-          "$ref": "#/definitions/Some generic-vnf-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:generic-vnf-name": {
-          "$ref": "#/definitions/Some generic-vnf-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:generic-vnf-type": {
-          "$ref": "#/definitions/Some generic-vnf-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-name": {
-          "$ref": "#/definitions/Some vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "VNF-API:vnf-type": {
-          "$ref": "#/definitions/Some vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         }
       },
@@ -26045,7 +34448,7 @@
     "VNF-API/vnf-topology-information/vnf-assignments(config)availability-zones": {
       "properties": {
         "VNF-API:availability-zone": {
-          "$ref": "#/definitions/Some availability-zone",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Openstack availability zone name or UUID"
         }
       },
@@ -26065,31 +34468,43 @@
     "VNF-API/vnf-topology-information/vnf-assignments(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:sriov-vlan-filter-list": {
@@ -26099,12 +34514,15 @@
           "type": "array"
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -26124,7 +34542,7 @@
     "VNF-API/vnf-topology-information/vnf-assignments(config)vnf-vms": {
       "properties": {
         "VNF-API:vm-count": {
-          "$ref": "#/definitions/0"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vm-names": {
           "items": {
@@ -26140,7 +34558,7 @@
           "type": "array"
         },
         "VNF-API:vm-type": {
-          "$ref": "#/definitions/Some vm-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -26159,7 +34577,7 @@
     "VNF-API/vnf-topology-information/vnf-assignments/vnf-networks(config)sriov-vlan-filter-list": {
       "properties": {
         "VNF-API:sriov-vlan-filter": {
-          "$ref": "#/definitions/Some sriov-vlan-filter"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -26178,7 +34596,13 @@
     "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms(config)vm-names": {
       "properties": {
         "VNF-API:vm-name": {
-          "$ref": "#/definitions/Some vm-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -26197,15 +34621,11 @@
     "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms(config)vm-networks": {
       "properties": {
         "VNF-API:floating-ip": {
-          "$ref": "#/definitions/4.73.2.1%L{{",
-          "description": "Floating ipv4 for VMs of a given type on this network",
-          "enum": [
-            "4.73.2.1%L{{",
-            "AbBc:31A"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Floating ipv4 for VMs of a given type on this network"
         },
         "VNF-API:floating-ip-v6": {
-          "$ref": "#/definitions/DD4f:c%p}",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Floating ipv6 for VMs of a given type on this network"
         },
         "VNF-API:interface-route-prefixes": {
@@ -26215,9 +34635,13 @@
           "type": "array"
         },
         "VNF-API:ip-count": {
-          "$ref": "#/definitions/0",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The number of ip addresses to be assigned per vm for this network role"
         },
+        "VNF-API:ip-count-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ipv6 addresses to be assigned per vm for this network role"
+        },
         "VNF-API:network-ips": {
           "items": {
             "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips"
@@ -26237,16 +34661,16 @@
           "type": "array"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:use-dhcp": {
-          "$ref": "#/definitions/Y",
-          "description": "Indicator to use DHCP on this network for this VM",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VM"
         }
       },
       "type": "object"
@@ -26263,18 +34687,154 @@
       },
       "type": "object"
     },
+    "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names": {
+      "properties": {
+        "VNF-API:vnfc-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP": {
+      "properties": {
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks": {
+      "properties": {
+        "VNF-API:vnfc-network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP": {
+      "properties": {
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        },
+        "VNF-API:vnfc-subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments": {
+      "properties": {
+        "VNF-API:vnfc-address-family": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Subnet Version tells if this is IpV4 or IpV6"
+        },
+        "VNF-API:vnfc-subnet-dhcp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VNFC. Unless dhcp=N, we wouldnt have any address, since they would not be sdnc assigned "
+        },
+        "VNF-API:vnfc-subnet-ipcount": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ip addresses to be assigned per vnfc for this subnet role"
+        },
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips": {
+      "properties": {
+        "VNF-API:ip-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. "
+        },
+        "VNF-API:vnfc-address-ipv4": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion. "
+        },
+        "VNF-API:vnfc-address-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion."
+        },
+        "VNF-API:vnfc-client-key": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": {
       "properties": {
         "VNF-API:interface-route-prefix": {
-          "$ref": "#/definitions/2.1.25.25",
-          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
-          "enum": [
-            "2.1.25.25",
-            ":A:E:f3B7%LL"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"
         },
         "VNF-API:interface-route-prefix-cidr": {
-          "$ref": "#/definitions/Some interface-route-prefix-cidr",
+          "$ref": "#/definitions/Optional.empty",
           "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"
         }
       },
@@ -26294,12 +34854,8 @@
     "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": {
       "properties": {
         "VNF-API:ip-address": {
-          "$ref": "#/definitions/0.0.1.0%N",
-          "description": "List of assigned ipv4 addresses on a network",
-          "enum": [
-            "0.0.1.0%N",
-            "66a:"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "List of assigned ipv4 addresses on a network"
         }
       },
       "type": "object"
@@ -26318,7 +34874,7 @@
     "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": {
       "properties": {
         "VNF-API:ip-address-ipv6": {
-          "$ref": "#/definitions/2e5E:%LN",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of assigned ipv6 addresses on a network"
         }
       },
@@ -26338,7 +34894,7 @@
     "VNF-API/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-macs": {
       "properties": {
         "VNF-API:mac-address": {
-          "$ref": "#/definitions/Some mac-address",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of network assignments for this VM (one per network)"
         }
       },
@@ -26370,7 +34926,7 @@
           "type": "object"
         },
         "VNF-API:vnf-id": {
-          "$ref": "#/definitions/Some vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         }
       },
@@ -26417,7 +34973,7 @@
           "type": "object"
         },
         "VNF-API:vnf-id": {
-          "$ref": "#/definitions/Some vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "VNF-API:vnf-request-information": {
@@ -26449,78 +35005,31 @@
     "VNF-API/vnfs/vnf-list(config)service-status": {
       "properties": {
         "VNF-API:final-indicator": {
-          "$ref": "#/definitions/Some final-indicator"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-status": {
-          "$ref": "#/definitions/synccomplete",
-          "enum": [
-            "synccomplete",
-            "asynccomplete",
-            "notifycomplete"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-code": {
-          "$ref": "#/definitions/Some response-code"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-message": {
-          "$ref": "#/definitions/Some response-message"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:response-timestamp": {
-          "$ref": "#/definitions/Some response-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:rpc-action": {
-          "$ref": "#/definitions/reserve",
-          "enum": [
-            "reserve",
-            "assign",
-            "activate",
-            "delete",
-            "changeassign",
-            "changedelete",
-            "rollback"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:rpc-name": {
-          "$ref": "#/definitions/vnf-topology-operation",
-          "enum": [
-            "vnf-topology-operation",
-            "preload-vnf-topology-operation",
-            "vnf-instance-topology-operation",
-            "preload-vnf-instance-topology-operation",
-            "vf-module-topology-operation",
-            "preload-vf-module-topology-operation"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnfsdn-action": {
-          "$ref": "#/definitions/PreloadNetworkRequest",
-          "enum": [
-            "PreloadNetworkRequest",
-            "DeletePreloadNetworkRequest",
-            "NetworkActivateRequest",
-            "DisconnectNetworkRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "DisconnectVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "DisconnectVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnfsdn-subaction": {
-          "$ref": "#/definitions/SUPP",
-          "enum": [
-            "SUPP",
-            "CANCEL"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -26539,62 +35048,25 @@
     "VNF-API/vnfs/vnf-list/service-data(config)oper-status": {
       "properties": {
         "VNF-API:create-timestamp": {
-          "$ref": "#/definitions/Some create-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-action": {
-          "$ref": "#/definitions/VNFActivateRequest",
-          "enum": [
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVNFRequest",
-            "DisconnectVnfInstanceRequest",
-            "DisconnectVfModuleRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:last-svc-request-id": {
-          "$ref": "#/definitions/Some last-svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:maintenance-indicator": {
-          "$ref": "#/definitions/Y",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:modify-timestamp": {
-          "$ref": "#/definitions/Some modify-timestamp"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-status": {
-          "$ref": "#/definitions/Active",
-          "enum": [
-            "Active",
-            "PendingAssignment",
-            "PendingCreate",
-            "PendingUpdate",
-            "PendingDelete",
-            "Deleted"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -26613,50 +35085,25 @@
     "VNF-API/vnfs/vnf-list/service-data(config)request-information": {
       "properties": {
         "VNF-API:notification-url": {
-          "$ref": "#/definitions/Some notification-url"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-number": {
-          "$ref": "#/definitions/Some order-number"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:order-version": {
-          "$ref": "#/definitions/Some order-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-action": {
-          "$ref": "#/definitions/PreloadNetworkRequest",
-          "enum": [
-            "PreloadNetworkRequest",
-            "DeletePreloadNetworkRequest",
-            "NetworkActivateRequest",
-            "DisconnectNetworkRequest",
-            "PreloadVNFRequest",
-            "DeletePreloadVNFRequest",
-            "VNFActivateRequest",
-            "ChangeVNFActivateRequest",
-            "DisconnectVNFRequest",
-            "PreloadVnfInstanceRequest",
-            "DeletePreloadVnfInstanceRequest",
-            "VnfInstanceActivateRequest",
-            "ChangeVnfInstanceActivateRequest",
-            "DisconnectVnfInstanceRequest",
-            "PreloadVfModuleRequest",
-            "DeletePreloadVfModuleRequest",
-            "VfModuleActivateRequest",
-            "ChangeVfModuleActivateRequest",
-            "DisconnectVfModuleRequest"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-id": {
-          "$ref": "#/definitions/Some request-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:request-sub-action": {
-          "$ref": "#/definitions/SUPP",
-          "enum": [
-            "SUPP",
-            "CANCEL"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:source": {
-          "$ref": "#/definitions/Some source"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -26675,22 +35122,13 @@
     "VNF-API/vnfs/vnf-list/service-data(config)sdnc-request-header": {
       "properties": {
         "VNF-API:svc-action": {
-          "$ref": "#/definitions/reserve",
-          "enum": [
-            "reserve",
-            "assign",
-            "activate",
-            "delete",
-            "changeassign",
-            "changedelete",
-            "rollback"
-          ]
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-notification-url": {
-          "$ref": "#/definitions/Some svc-notification-url"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:svc-request-id": {
-          "$ref": "#/definitions/Some svc-request-id"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -26709,18 +35147,18 @@
     "VNF-API/vnfs/vnf-list/service-data(config)service-information": {
       "properties": {
         "VNF-API:service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-instance-id": {
-          "$ref": "#/definitions/Some service-instance-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A service instance that a VNF or a l3-network is associated with"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI subscription-service-type"
         },
         "VNF-API:subscriber-name": {
-          "$ref": "#/definitions/Some subscriber-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "AnAI global-customer-id"
         }
       },
@@ -26740,45 +35178,41 @@
     "VNF-API/vnfs/vnf-list/service-data(config)vnf-request-information": {
       "properties": {
         "VNF-API:aic-clli": {
-          "$ref": "#/definitions/Some aic-clli"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:aic-cloud-region": {
-          "$ref": "#/definitions/Some aic-cloud-region",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The AIC cloud region which maps to contrail versions"
         },
         "VNF-API:generic-vnf-id": {
-          "$ref": "#/definitions/Some generic-vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic vnf-id"
         },
         "VNF-API:generic-vnf-name": {
-          "$ref": "#/definitions/Some generic-vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic vnf name"
         },
         "VNF-API:generic-vnf-type": {
-          "$ref": "#/definitions/Some generic-vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "generic vnf type"
         },
         "VNF-API:model-customization-uuid": {
-          "$ref": "#/definitions/Some model-customization-uuid",
+          "$ref": "#/definitions/Optional.empty",
           "description": "customized resource, i.e. vf-module, for use within a given service"
         },
         "VNF-API:tenant": {
-          "$ref": "#/definitions/Some tenant"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:use-preload": {
-          "$ref": "#/definitions/Y",
-          "description": "orchestrate vf-module with full preload data or TOSCA lookup plus EIPAM automation",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "orchestrate vf-module with full preload data or TOSCA lookup plus EIPAM automation"
         },
         "VNF-API:vnf-id": {
-          "$ref": "#/definitions/Some vnf-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-id"
         },
         "VNF-API:vnf-name": {
-          "$ref": "#/definitions/Some vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "VNF-API:vnf-networks": {
@@ -26789,10 +35223,10 @@
           "type": "array"
         },
         "VNF-API:vnf-request-version": {
-          "$ref": "#/definitions/Some vnf-request-version"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-type": {
-          "$ref": "#/definitions/Some vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         }
       },
@@ -26846,40 +35280,55 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-request-information(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -26912,7 +35361,7 @@
           "type": "array"
         },
         "VNF-API:vnf-status": {
-          "$ref": "#/definitions/Some vnf-status",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Orchestration Status from AAI - to be set by SDNC"
         },
         "VNF-API:vnf-vms": {
@@ -26938,11 +35387,11 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information(config)vnf-parameters": {
       "properties": {
         "VNF-API:vnf-parameter-name": {
-          "$ref": "#/definitions/Some vnf-parameter-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The name of an arbitrary instance-specific vnf-parameters"
         },
         "VNF-API:vnf-parameter-value": {
-          "$ref": "#/definitions/Some vnf-parameter-value",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The value of an arbitrary instance-specific vnf-parameters "
         }
       },
@@ -26962,26 +35411,26 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information(config)vnf-topology-identifier": {
       "properties": {
         "VNF-API:generic-vnf-id": {
-          "$ref": "#/definitions/Some generic-vnf-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:generic-vnf-name": {
-          "$ref": "#/definitions/Some generic-vnf-name"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:generic-vnf-type": {
-          "$ref": "#/definitions/Some generic-vnf-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-id": {
-          "$ref": "#/definitions/Some service-id"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:service-type": {
-          "$ref": "#/definitions/Some service-type"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vnf-name": {
-          "$ref": "#/definitions/Some vnf-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-name"
         },
         "VNF-API:vnf-type": {
-          "$ref": "#/definitions/Some vnf-type",
+          "$ref": "#/definitions/Optional.empty",
           "description": "vf-module-type"
         }
       },
@@ -27001,7 +35450,7 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments(config)availability-zones": {
       "properties": {
         "VNF-API:availability-zone": {
-          "$ref": "#/definitions/Some availability-zone",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Openstack availability zone name or UUID"
         }
       },
@@ -27021,31 +35470,43 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments(config)vnf-networks": {
       "properties": {
         "VNF-API:contrail-network-fqdn": {
-          "$ref": "#/definitions/Some contrail-network-fqdn",
+          "$ref": "#/definitions/Optional.empty",
           "description": "contrail network policy object"
         },
+        "VNF-API:ipv4-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv4 subnet.Key into A&AI instance."
+        },
+        "VNF-API:ipv6-key-subnet-id": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Unique SDN-C generated UUID of the ipv6 subnet.Key into A&AI instance."
+        },
         "VNF-API:ipv6-subnet-id": {
-          "$ref": "#/definitions/Some ipv6-subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:ipv6-subnet-name": {
-          "$ref": "#/definitions/Some ipv6-subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv6 subnet-name that corresponds to the ipv6 subnet-id"
         },
         "VNF-API:network-id": {
-          "$ref": "#/definitions/Some network-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-name": {
-          "$ref": "#/definitions/Some network-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "A Network Role to which a VNF must connect"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:neutron-id": {
-          "$ref": "#/definitions/Some neutron-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Unique Neutron UUID of an instance of the network role "
         },
         "VNF-API:sriov-vlan-filter-list": {
@@ -27055,12 +35516,15 @@
           "type": "array"
         },
         "VNF-API:subnet-id": {
-          "$ref": "#/definitions/Some subnet-id",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet UUID to be passed into the HEAT template for DHCP assignment"
         },
         "VNF-API:subnet-name": {
-          "$ref": "#/definitions/Some subnet-name",
+          "$ref": "#/definitions/Optional.empty",
           "description": "ipv4 subnet-name that corresponds to the ipv4 subnet-id"
+        },
+        "VNF-API:subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -27080,7 +35544,7 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments(config)vnf-vms": {
       "properties": {
         "VNF-API:vm-count": {
-          "$ref": "#/definitions/0"
+          "$ref": "#/definitions/Optional.empty"
         },
         "VNF-API:vm-names": {
           "items": {
@@ -27096,7 +35560,7 @@
           "type": "array"
         },
         "VNF-API:vm-type": {
-          "$ref": "#/definitions/Some vm-type"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -27115,7 +35579,7 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-networks(config)sriov-vlan-filter-list": {
       "properties": {
         "VNF-API:sriov-vlan-filter": {
-          "$ref": "#/definitions/Some sriov-vlan-filter"
+          "$ref": "#/definitions/Optional.empty"
         }
       },
       "type": "object"
@@ -27134,7 +35598,13 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms(config)vm-names": {
       "properties": {
         "VNF-API:vm-name": {
-          "$ref": "#/definitions/Some vm-name"
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -27153,15 +35623,11 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms(config)vm-networks": {
       "properties": {
         "VNF-API:floating-ip": {
-          "$ref": "#/definitions/162.4.7.0%}L",
-          "description": "Floating ipv4 for VMs of a given type on this network",
-          "enum": [
-            "162.4.7.0%}L",
-            "881:"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Floating ipv4 for VMs of a given type on this network"
         },
         "VNF-API:floating-ip-v6": {
-          "$ref": "#/definitions/b6AE:d",
+          "$ref": "#/definitions/Optional.empty",
           "description": "Floating ipv6 for VMs of a given type on this network"
         },
         "VNF-API:interface-route-prefixes": {
@@ -27171,9 +35637,13 @@
           "type": "array"
         },
         "VNF-API:ip-count": {
-          "$ref": "#/definitions/0",
+          "$ref": "#/definitions/Optional.empty",
           "description": "The number of ip addresses to be assigned per vm for this network role"
         },
+        "VNF-API:ip-count-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ipv6 addresses to be assigned per vm for this network role"
+        },
         "VNF-API:network-ips": {
           "items": {
             "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips"
@@ -27193,16 +35663,16 @@
           "type": "array"
         },
         "VNF-API:network-role": {
-          "$ref": "#/definitions/Some network-role",
+          "$ref": "#/definitions/Optional.empty",
           "description": "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF"
         },
+        "VNF-API:network-role-tag": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The network-role that maps to the HEAT parameter {network-role}_net_id"
+        },
         "VNF-API:use-dhcp": {
-          "$ref": "#/definitions/Y",
-          "description": "Indicator to use DHCP on this network for this VM",
-          "enum": [
-            "Y",
-            "N"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VM"
         }
       },
       "type": "object"
@@ -27219,18 +35689,154 @@
       },
       "type": "object"
     },
+    "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names": {
+      "properties": {
+        "VNF-API:vnfc-name": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names-TOP": {
+      "properties": {
+        "VNF-API:vnfc-names": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names(config)vnfc-names"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks": {
+      "properties": {
+        "VNF-API:vnfc-network-role": {
+          "$ref": "#/definitions/Optional.empty"
+        },
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks-TOP": {
+      "properties": {
+        "VNF-API:vnfc-networks": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names(config)vnfc-networks"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        },
+        "VNF-API:vnfc-subnet-role": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnets": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks(config)vnfc-subnets"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments": {
+      "properties": {
+        "VNF-API:vnfc-address-family": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Subnet Version tells if this is IpV4 or IpV6"
+        },
+        "VNF-API:vnfc-subnet-dhcp": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Indicator to use DHCP on this network for this VNFC. Unless dhcp=N, we wouldnt have any address, since they would not be sdnc assigned "
+        },
+        "VNF-API:vnfc-subnet-ipcount": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "The number of ip addresses to be assigned per vnfc for this subnet role"
+        },
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments-TOP": {
+      "properties": {
+        "VNF-API:vnfc-ipassignments": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets(config)vnfc-ipassignments"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips": {
+      "properties": {
+        "VNF-API:ip-type": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. "
+        },
+        "VNF-API:vnfc-address-ipv4": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion. "
+        },
+        "VNF-API:vnfc-address-ipv6": {
+          "$ref": "#/definitions/Optional.empty",
+          "description": "Either IpV4 IP addresses or IpV6 IP addresses should be present,  but not both within one VnfcVersion."
+        },
+        "VNF-API:vnfc-client-key": {
+          "$ref": "#/definitions/Optional.empty"
+        }
+      },
+      "type": "object"
+    },
+    "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips-TOP": {
+      "properties": {
+        "VNF-API:vnfc-subnet-ips": {
+          "items": {
+            "$ref": "#/definitions/VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-names/vnfc-names/vnfc-networks/vnfc-subnets/vnfc-ipassignments(config)vnfc-subnet-ips"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    },
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)interface-route-prefixes": {
       "properties": {
         "VNF-API:interface-route-prefix": {
-          "$ref": "#/definitions/7.72.0.1%}",
-          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes",
-          "enum": [
-            "7.72.0.1%}",
-            ":3CfA"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"
         },
         "VNF-API:interface-route-prefix-cidr": {
-          "$ref": "#/definitions/Some interface-route-prefix-cidr",
+          "$ref": "#/definitions/Optional.empty",
           "description": "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"
         }
       },
@@ -27250,12 +35856,8 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips": {
       "properties": {
         "VNF-API:ip-address": {
-          "$ref": "#/definitions/233.9.0.25%L}L",
-          "description": "List of assigned ipv4 addresses on a network",
-          "enum": [
-            "233.9.0.25%L}L",
-            "Fe:1"
-          ]
+          "$ref": "#/definitions/Optional.empty",
+          "description": "List of assigned ipv4 addresses on a network"
         }
       },
       "type": "object"
@@ -27274,7 +35876,7 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-ips-v6": {
       "properties": {
         "VNF-API:ip-address-ipv6": {
-          "$ref": "#/definitions/77:",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of assigned ipv6 addresses on a network"
         }
       },
@@ -27294,7 +35896,7 @@
     "VNF-API/vnfs/vnf-list/service-data/vnf-topology-information/vnf-assignments/vnf-vms/vm-networks(config)network-macs": {
       "properties": {
         "VNF-API:mac-address": {
-          "$ref": "#/definitions/Some mac-address",
+          "$ref": "#/definitions/Optional.empty",
           "description": "List of network assignments for this VM (one per network)"
         }
       },