Update swagger file and html to latest versions

[aai/aai-common.git] / aai-schema / src / main / resources / aai_swagger_yaml / aai_swagger_v12.yaml

diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v12.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v12.yaml
index b1d047e..f5c1a63 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v12.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v12.yaml
@@ -141,21 +141,6 @@ paths:
           required: true
           type: string
           example: __AVAILABILITY-ZONE-NAME__
-        - name: data-center-code
-          in: query
-          description: Data center code which can be an alternate way to identify a complex
-          required: false
-          type: string
-        - name: complex-name
-          in: query
-          description: Gamma complex name for LCP instance.
-          required: false
-          type: string
-        - name: identity-url
-          in: query
-          description: URL of the keystone identity service
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -246,7 +231,7 @@ paths:
           example: __AVAILABILITY-ZONE-NAME__
         - name: body
           in: body
-          description: ctag-pool object that needs to be created or updated. 
+          description: ctag-pool object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/ctag-pool"
@@ -313,19 +298,9 @@ paths:
           required: true
           type: string
           example: __PHYSICAL-LOCATION-ID__
-        - name: data-center-code
-          in: query
-          description: Data center code which can be an alternate way to identify a complex
-          required: false
-          type: string
-        - name: complex-name
-          in: query
-          description: Gamma complex name for LCP instance.
-          required: false
-          type: string
-        - name: identity-url
+        - name: availability-zone-name
           in: query
-          description: URL of the keystone identity service
+          description:
           required: false
           type: string
   /cloud-infrastructure/complexes/complex/{physical-location-id}/relationship-list/relationship:
@@ -402,21 +377,6 @@ paths:
           required: true
           type: string
           example: __PHYSICAL-LOCATION-ID__
-        - name: data-center-code
-          in: query
-          description: Data center code which can be an alternate way to identify a complex
-          required: false
-          type: string
-        - name: complex-name
-          in: query
-          description: Gamma complex name for LCP instance.
-          required: false
-          type: string
-        - name: identity-url
-          in: query
-          description: URL of the keystone identity service
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -483,7 +443,7 @@ paths:
           example: __PHYSICAL-LOCATION-ID__
         - name: body
           in: body
-          description: complex object that needs to be created or updated. 
+          description: complex object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/complex"
@@ -531,6 +491,27 @@ paths:
               $ref: "#/getDefinitions/complexes"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: physical-location-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: data-center-code
+          in: query
+          description:
+          required: false
+          type: string
+        - name: complex-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: identity-url
+          in: query
+          description:
+          required: false
+          type: string
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups/volume-group/{volume-group-id}/relationship-list/relationship:
     put:
       tags:
@@ -641,31 +622,6 @@ paths:
           required: true
           type: string
           example: __VOLUME-GROUP-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: volume-group-name
-          in: query
-          description: Name of the volume group.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this volume-group
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -756,7 +712,7 @@ paths:
           example: __VOLUME-GROUP-ID__
         - name: body
           in: body
-          description: volume-group object that needs to be created or updated. 
+          description: volume-group object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/volume-group"
@@ -829,214 +785,32 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/volumes/volume/{volume-id}/relationship-list/relationship:
-    put:
-      tags:
-        - CloudInfrastructure
-      summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolumeRelationshipListRelationship
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: cloud-owner
-          in: path
-          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
-          required: true
-          type: string
-          example: __CLOUD-OWNER__
-        - name: cloud-region-id
-          in: path
-          description: Identifier used by the vendor for the region. Second part of composite key
-          required: true
-          type: string
-          example: __CLOUD-REGION-ID__
-        - name: tenant-id
-          in: path
-          description: Unique id relative to the cloud-region.
-          required: true
-          type: string
-          example: __TENANT-ID__
-        - name: vserver-id
-          in: path
-          description: Unique identifier for this vserver relative to its tenant
-          required: true
-          type: string
-          example: __VSERVER-ID__
-        - name: volume-id
-          in: path
-          description: Unique ID of block storage volume relative to the vserver.
-          required: true
-          type: string
-          example: __VOLUME-ID__
-        - name: body
-          in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume.json)
-          required: true
-          schema:
-            $ref: "#/definitions/relationship"
-    delete:
-      tags:
-        - CloudInfrastructure
-      summary: delete an existing relationship
-      description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolumeRelationshipListRelationship
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: cloud-owner
-          in: path
-          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
-          required: true
-          type: string
-          example: __CLOUD-OWNER__
-        - name: cloud-region-id
-          in: path
-          description: Identifier used by the vendor for the region. Second part of composite key
-          required: true
-          type: string
-          example: __CLOUD-REGION-ID__
-        - name: tenant-id
-          in: path
-          description: Unique id relative to the cloud-region.
-          required: true
-          type: string
-          example: __TENANT-ID__
-        - name: vserver-id
-          in: path
-          description: Unique identifier for this vserver relative to its tenant
-          required: true
-          type: string
-          example: __VSERVER-ID__
-        - name: volume-id
-          in: path
-          description: Unique ID of block storage volume relative to the vserver.
-          required: true
-          type: string
-          example: __VOLUME-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/volumes/volume/{volume-id}:
-    get:
-      tags:
-        - CloudInfrastructure
-      summary: returns volume
-      description: returns volume
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/volume"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: cloud-owner
-          in: path
-          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
-          required: true
-          type: string
-          example: __CLOUD-OWNER__
-        - name: cloud-region-id
-          in: path
-          description: Identifier used by the vendor for the region. Second part of composite key
-          required: true
-          type: string
-          example: __CLOUD-REGION-ID__
-        - name: tenant-id
-          in: path
-          description: Unique id relative to the cloud-region.
-          required: true
-          type: string
-          example: __TENANT-ID__
-        - name: vserver-id
-          in: path
-          description: Unique identifier for this vserver relative to its tenant
-          required: true
-          type: string
-          example: __VSERVER-ID__
-        - name: volume-id
-          in: path
-          description: Unique ID of block storage volume relative to the vserver.
-          required: true
-          type: string
-          example: __VOLUME-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
+        - name: volume-group-id
           in: query
-          description: This field will store the tenant context.
+          description:
           required: false
           type: string
-        - name: vserver-name
+        - name: volume-group-name
           in: query
-          description: Name of vserver
+          description:
           required: false
           type: string
-        - name: vserver-name2
+        - name: heat-stack-id
           in: query
-          description: Alternative name of vserver
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: vnf-type
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/volumes/volume/{volume-id}/relationship-list/relationship:
     put:
       tags:
         - CloudInfrastructure
-      summary: create or update an existing volume
-      description: |
-        Create or update an existing volume.
-        #
-        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolumeRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -1079,27 +853,16 @@ paths:
           example: __VOLUME-ID__
         - name: body
           in: body
-          description: volume object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume.json)
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume.json)
           required: true
           schema:
-            $ref: "#/definitions/volume"
-    patch:
+            $ref: "#/definitions/relationship"
+    delete:
       tags:
         - CloudInfrastructure
-      summary: update an existing volume
-      description: |
-        Update an existing volume
-        #
-        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
-        The PUT operation will entirely replace an existing object.
-        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
-        #
-        Other differences between PUT and PATCH are:
-        #
-        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
-        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
-        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
-      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolumeRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -1140,25 +903,21 @@ paths:
           required: true
           type: string
           example: __VOLUME-ID__
-        - name: body
-          in: body
-          description: volume object that needs to be created or updated. 
-          required: true
-          schema:
-            $ref: "#/patchDefinitions/volume"
-    delete:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/volumes/volume/{volume-id}:
+    get:
       tags:
         - CloudInfrastructure
-      summary: delete an existing volume
-      description: delete an existing volume
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume
-      consumes:
-        - application/json
-        - application/xml
+      summary: returns volume
+      description: returns volume
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume
       produces:
         - application/json
         - application/xml
       responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/volume"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -1192,26 +951,22 @@ paths:
           required: true
           type: string
           example: __VOLUME-ID__
-        - name: resource-version
-          in: query
-          description: resource-version for concurrency
-          required: true
-          type: string
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/volumes:
-    get:
+    put:
       tags:
         - CloudInfrastructure
-      summary: returns volumes
-      description: returns volumes
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumes
+      summary: create or update an existing volume
+      description: |
+        Create or update an existing volume.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume
+      consumes:
+        - application/json
+        - application/xml
       produces:
         - application/json
         - application/xml
       responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/volumes"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -1239,55 +994,35 @@ paths:
           required: true
           type: string
           example: __VSERVER-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
-        - name: vserver-name
-          in: query
-          description: Name of vserver
-          required: false
-          type: string
-        - name: vserver-name2
-          in: query
-          description: Alternative name of vserver
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
+        - name: volume-id
+          in: path
+          description: Unique ID of block storage volume relative to the vserver.
+          required: true
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/relationship-list/relationship:
-    put:
+          example: __VOLUME-ID__
+        - name: body
+          in: body
+          description: volume object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume.json)
+          required: true
+          schema:
+            $ref: "#/definitions/volume"
+    patch:
       tags:
         - CloudInfrastructure
-      summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverRelationshipListRelationship
+      summary: update an existing volume
+      description: |
+        Update an existing volume
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume
       consumes:
         - application/json
         - application/xml
@@ -1322,18 +1057,24 @@ paths:
           required: true
           type: string
           example: __VSERVER-ID__
+        - name: volume-id
+          in: path
+          description: Unique ID of block storage volume relative to the vserver.
+          required: true
+          type: string
+          example: __VOLUME-ID__
         - name: body
           in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserver.json)
+          description: volume object that needs to be updated.
           required: true
           schema:
-            $ref: "#/definitions/relationship"
+            $ref: "#/patchDefinitions/volume"
     delete:
       tags:
         - CloudInfrastructure
-      summary: delete an existing relationship
-      description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverRelationshipListRelationship
+      summary: delete an existing volume
+      description: delete an existing volume
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumesVolume
       consumes:
         - application/json
         - application/xml
@@ -1368,19 +1109,32 @@ paths:
           required: true
           type: string
           example: __VSERVER-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/relationship-list/relationship:
-    put:
+        - name: volume-id
+          in: path
+          description: Unique ID of block storage volume relative to the vserver.
+          required: true
+          type: string
+          example: __VOLUME-ID__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/volumes:
+    get:
       tags:
         - CloudInfrastructure
-      summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanRelationshipListRelationship
-      consumes:
-        - application/json
-        - application/xml
+      summary: returns volumes
+      description: returns volumes
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverVolumes
       produces:
         - application/json
         - application/xml
       responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/volumes"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -1408,21 +1162,54 @@ paths:
           required: true
           type: string
           example: __VSERVER-ID__
-        - name: interface-name
+        - name: volume-id
+          in: query
+          description:
+          required: false
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/relationship-list/relationship:
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
           in: path
-          description: Name given to the interface
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
           required: true
           type: string
-          example: __INTERFACE-NAME__
-        - name: vlan-interface
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
           in: path
-          description: String that identifies the interface
+          description: Identifier used by the vendor for the region. Second part of composite key
           required: true
           type: string
-          example: __VLAN-INTERFACE__
+          example: __CLOUD-REGION-ID__
+        - name: tenant-id
+          in: path
+          description: Unique id relative to the cloud-region.
+          required: true
+          type: string
+          example: __TENANT-ID__
+        - name: vserver-id
+          in: path
+          description: Unique identifier for this vserver relative to its tenant
+          required: true
+          type: string
+          example: __VSERVER-ID__
         - name: body
           in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlan.json)
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserver.json)
           required: true
           schema:
             $ref: "#/definitions/relationship"
@@ -1431,7 +1218,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -1466,24 +1253,12 @@ paths:
           required: true
           type: string
           example: __VSERVER-ID__
-        - name: interface-name
-          in: path
-          description: Name given to the interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: vlan-interface
-          in: path
-          description: String that identifies the interface
-          required: true
-          type: string
-          example: __VLAN-INTERFACE__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}/relationship-list/relationship:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/relationship-list/relationship:
     put:
       tags:
         - CloudInfrastructure
       summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanL3InterfaceIpv4AddressListRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -1530,15 +1305,9 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: l3-interface-ipv4-address
-          in: path
-          description: IP address
-          required: true
-          type: string
-          example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanL3InterfaceIpv4AddressList.json)
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlan.json)
           required: true
           schema:
             $ref: "#/definitions/relationship"
@@ -1547,7 +1316,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanL3InterfaceIpv4AddressListRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -1594,27 +1363,19 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: l3-interface-ipv4-address
-          in: path
-          description: IP address
-          required: true
-          type: string
-          example: __L3-INTERFACE-IPV4-ADDRESS__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}:
-    get:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}/relationship-list/relationship:
+    put:
       tags:
         - CloudInfrastructure
-      summary: returns l3-interface-ipv4-address-list
-      description: returns l3-interface-ipv4-address-list
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanL3InterfaceIpv4AddressList
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanL3InterfaceIpv4AddressListRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
       produces:
         - application/json
         - application/xml
       responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/l3-interface-ipv4-address-list"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -1660,91 +1421,130 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
+        - name: body
+          in: body
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanL3InterfaceIpv4AddressList.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanL3InterfaceIpv4AddressListRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
           type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
           type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
+          example: __CLOUD-REGION-ID__
+        - name: tenant-id
+          in: path
+          description: Unique id relative to the cloud-region.
+          required: true
           type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
+          example: __TENANT-ID__
+        - name: vserver-id
+          in: path
+          description: Unique identifier for this vserver relative to its tenant
+          required: true
           type: string
-        - name: vserver-name
-          in: query
-          description: Name of vserver
-          required: false
+          example: __VSERVER-ID__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
           type: string
-        - name: vserver-name2
-          in: query
-          description: Alternative name of vserver
-          required: false
+          example: __INTERFACE-NAME__
+        - name: vlan-interface
+          in: path
+          description: String that identifies the interface
+          required: true
           type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
+          example: __VLAN-INTERFACE__
+        - name: l3-interface-ipv4-address
+          in: path
+          description: IP address
+          required: true
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
+          example: __L3-INTERFACE-IPV4-ADDRESS__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns l3-interface-ipv4-address-list
+      description: returns l3-interface-ipv4-address-list
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverLInterfacesLInterfaceVlansVlanL3InterfaceIpv4AddressList
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/l3-interface-ipv4-address-list"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
           type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
           type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
+          example: __CLOUD-REGION-ID__
+        - name: tenant-id
+          in: path
+          description: Unique id relative to the cloud-region.
+          required: true
           type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
+          example: __TENANT-ID__
+        - name: vserver-id
+          in: path
+          description: Unique identifier for this vserver relative to its tenant
+          required: true
           type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
+          example: __VSERVER-ID__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
           type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
+          example: __INTERFACE-NAME__
+        - name: vlan-interface
+          in: path
+          description: String that identifies the interface
+          required: true
+          type: string
+          example: __VLAN-INTERFACE__
+        - name: l3-interface-ipv4-address
+          in: path
+          description: IP address
+          required: true
           type: string
+          example: __L3-INTERFACE-IPV4-ADDRESS__
     put:
       tags:
         - CloudInfrastructure
@@ -1883,7 +1683,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -2132,91 +1932,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
-        - name: vserver-name
-          in: query
-          description: Name of vserver
-          required: false
-          type: string
-        - name: vserver-name2
-          in: query
-          description: Alternative name of vserver
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -2355,7 +2070,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -2476,75 +2191,6 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
-        - name: vserver-name
-          in: query
-          description: Name of vserver
-          required: false
-          type: string
-        - name: vserver-name2
-          in: query
-          description: Alternative name of vserver
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -2671,7 +2317,7 @@ paths:
           example: __VLAN-INTERFACE__
         - name: body
           in: body
-          description: vlan object that needs to be created or updated. 
+          description: vlan object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vlan"
@@ -2780,62 +2426,20 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
-        - name: vserver-name
-          in: query
-          description: Name of vserver
-          required: false
-          type: string
-        - name: vserver-name2
-          in: query
-          description: Alternative name of vserver
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: interface-id
+        - name: vlan-interface
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vlan-id-inner
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: integer
+          format: int64
+        - name: vpn-key
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}/relationship-list/relationship:
@@ -3002,84 +2606,6 @@ paths:
           required: true
           type: string
           example: __PCI-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
-        - name: vserver-name
-          in: query
-          description: Name of vserver
-          required: false
-          type: string
-        - name: vserver-name2
-          in: query
-          description: Alternative name of vserver
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vf-vlan-filter
-          in: query
-          description: This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.
-          required: false
-          type: string
-        - name: vf-mac-filter
-          in: query
-          description: When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.
-          required: false
-          type: string
-        - name: vf-vlan-strip
-          in: query
-          description: When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.
-          required: false
-          type: boolean
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -3206,7 +2732,7 @@ paths:
           example: __PCI-ID__
         - name: body
           in: body
-          description: sriov-vf object that needs to be created or updated. 
+          description: sriov-vf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-vf"
@@ -3315,62 +2841,29 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
-        - name: vserver-name
+        - name: pci-id
           in: query
-          description: Name of vserver
+          description:
           required: false
           type: string
-        - name: vserver-name2
+        - name: vf-vlan-filter
           in: query
-          description: Alternative name of vserver
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: vf-mac-filter
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
+        - name: vf-vlan-strip
           in: query
+          description:
           required: false
           type: boolean
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
+        - name: neutron-network-id
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/relationship-list/relationship:
@@ -3635,80 +3128,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
-        - name: vserver-name
-          in: query
-          description: Name of vserver
-          required: false
-          type: string
-        - name: vserver-name2
-          in: query
-          description: Alternative name of vserver
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -3835,7 +3254,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -4060,80 +3479,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
-        - name: vserver-name
-          in: query
-          description: Name of vserver
-          required: false
-          type: string
-        - name: vserver-name2
-          in: query
-          description: Alternative name of vserver
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -4260,7 +3605,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -4369,64 +3714,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
-        - name: vserver-name
-          in: query
-          description: Name of vserver
-          required: false
-          type: string
-        - name: vserver-name2
-          in: query
-          description: Alternative name of vserver
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -4541,7 +3828,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: l-interface object that needs to be created or updated. 
+          description: l-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l-interface"
@@ -4638,49 +3925,26 @@ paths:
           required: true
           type: string
           example: __VSERVER-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
+        - name: interface-name
           in: query
-          description: This field will store the tenant context.
+          description:
           required: false
           type: string
-        - name: vserver-name
+        - name: interface-id
           in: query
-          description: Name of vserver
+          description:
           required: false
           type: string
-        - name: vserver-name2
+        - name: macaddr
           in: query
-          description: Alternative name of vserver
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: network-name
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}:
     get:
       tags:
@@ -4723,49 +3987,6 @@ paths:
           required: true
           type: string
           example: __VSERVER-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
-        - name: vserver-name
-          in: query
-          description: Name of vserver
-          required: false
-          type: string
-        - name: vserver-name2
-          in: query
-          description: Alternative name of vserver
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
     put:
       tags:
         - CloudInfrastructure
@@ -4868,7 +4089,7 @@ paths:
           example: __VSERVER-ID__
         - name: body
           in: body
-          description: vserver object that needs to be created or updated. 
+          description: vserver object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vserver"
@@ -4953,26 +4174,36 @@ paths:
           required: true
           type: string
           example: __TENANT-ID__
-        - name: cloud-type
+        - name: vserver-id
           in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
           required: false
           type: string
-        - name: owner-defined-type
+        - name: vserver-name
           in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
           required: false
           type: string
-        - name: tenant-name
+        - name: vserver-name2
           in: query
-          description: Readable name of tenant
+          description:
           required: false
           type: string
-        - name: tenant-context
+        - name: prov-status
           in: query
-          description: This field will store the tenant context.
+          description:
           required: false
           type: string
+        - name: in-maint
+          in: query
+          description:
+          required: false
+          type: boolean
+        - name: is-closed-loop-disabled
+          in: query
+          description:
+          required: false
+          type: boolean
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/relationship-list/relationship:
     put:
       tags:
@@ -5083,26 +4314,6 @@ paths:
           required: true
           type: string
           example: __TENANT-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: tenant-name
-          in: query
-          description: Readable name of tenant
-          required: false
-          type: string
-        - name: tenant-context
-          in: query
-          description: This field will store the tenant context.
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -5193,7 +4404,7 @@ paths:
           example: __TENANT-ID__
         - name: body
           in: body
-          description: tenant object that needs to be created or updated. 
+          description: tenant object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/tenant"
@@ -5266,22 +4477,27 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: cloud-type
+        - name: tenant-id
           in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
           required: false
           type: string
-        - name: owner-defined-type
+        - name: tenant-name
           in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
           required: false
           type: string
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/relationship-list/relationship:
+        - name: tenant-context
+          in: query
+          description:
+          required: false
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship:
     put:
       tags:
         - CloudInfrastructure
       summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -5310,9 +4526,15 @@ paths:
           required: true
           type: string
           example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
         - name: body
           in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor.json)
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapability.json)
           required: true
           schema:
             $ref: "#/definitions/relationship"
@@ -5321,7 +4543,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -5350,66 +4572,18 @@ paths:
           required: true
           type: string
           example: __FLAVOR-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}:
-    get:
-      tags:
-        - CloudInfrastructure
-      summary: returns flavor
-      description: returns flavor
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/flavor"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: cloud-owner
+        - name: hpa-capability-id
           in: path
-          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
-          required: true
-          type: string
-          example: __CLOUD-OWNER__
-        - name: cloud-region-id
-          in: path
-          description: Identifier used by the vendor for the region. Second part of composite key
-          required: true
-          type: string
-          example: __CLOUD-REGION-ID__
-        - name: flavor-id
-          in: path
-          description: Flavor id, expected to be unique across cloud-region.
+          description: UUID to uniquely identify a HPA capability
           required: true
           type: string
-          example: __FLAVOR-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: flavor-name
-          in: query
-          description: Flavor name
-          required: false
-          type: string
+          example: __HPA-CAPABILITY-ID__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship:
     put:
       tags:
         - CloudInfrastructure
-      summary: create or update an existing flavor
-      description: |
-        Create or update an existing flavor.
-        #
-        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributesRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -5438,29 +4612,30 @@ paths:
           required: true
           type: string
           example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
         - name: body
           in: body
-          description: flavor object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor.json)
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
           required: true
           schema:
-            $ref: "#/definitions/flavor"
-    patch:
+            $ref: "#/definitions/relationship"
+    delete:
       tags:
         - CloudInfrastructure
-      summary: update an existing flavor
-      description: |
-        Update an existing flavor
-        #
-        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
-        The PUT operation will entirely replace an existing object.
-        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
-        #
-        Other differences between PUT and PATCH are:
-        #
-        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
-        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
-        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
-      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributesRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -5489,25 +4664,33 @@ paths:
           required: true
           type: string
           example: __FLAVOR-ID__
-        - name: body
-          in: body
-          description: flavor object that needs to be created or updated. 
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
           required: true
-          schema:
-            $ref: "#/patchDefinitions/flavor"
-    delete:
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}:
+    get:
       tags:
         - CloudInfrastructure
-      summary: delete an existing flavor
-      description: delete an existing flavor
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor
-      consumes:
-        - application/json
-        - application/xml
+      summary: returns hpa-feature-attributes
+      description: returns hpa-feature-attributes
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
       produces:
         - application/json
         - application/xml
       responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/hpa-feature-attributes"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -5529,26 +4712,34 @@ paths:
           required: true
           type: string
           example: __FLAVOR-ID__
-        - name: resource-version
-          in: query
-          description: resource-version for concurrency
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
           required: true
           type: string
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors:
-    get:
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+    put:
       tags:
         - CloudInfrastructure
-      summary: returns flavors
-      description: returns flavors
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionFlavors
+      summary: create or update an existing hpa-feature-attributes
+      description: |
+        Create or update an existing hpa-feature-attributes.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
       produces:
         - application/json
         - application/xml
       responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/flavors"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -5564,22 +4755,47 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
+        - name: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
           type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
           type: string
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}/relationship-list/relationship:
-    put:
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
       tags:
         - CloudInfrastructure
-      summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignmentRelationshipListRelationship
+      summary: update an existing hpa-feature-attributes
+      description: |
+        Update an existing hpa-feature-attributes
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
       consumes:
         - application/json
         - application/xml
@@ -5602,24 +4818,36 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: group-id
+        - name: flavor-id
           in: path
-          description: Group id, expected to be unique across cloud-region.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __GROUP-ID__
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
         - name: body
           in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment.json)
+          description: hpa-feature-attributes object that needs to be updated.
           required: true
           schema:
-            $ref: "#/definitions/relationship"
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
     delete:
       tags:
         - CloudInfrastructure
-      summary: delete an existing relationship
-      description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignmentRelationshipListRelationship
+      summary: delete an existing hpa-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
       consumes:
         - application/json
         - application/xml
@@ -5642,19 +4870,36 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: group-id
+        - name: flavor-id
           in: path
-          description: Group id, expected to be unique across cloud-region.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __GROUP-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}:
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}:
     get:
       tags:
         - CloudInfrastructure
-      summary: returns group-assignment
-      description: returns group-assignment
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
+      summary: returns hpa-capability
+      description: returns hpa-capability
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapability
       produces:
         - application/json
         - application/xml
@@ -5662,7 +4907,7 @@ paths:
         "200":
           description: successful operation
           schema:
-              $ref: "#/getDefinitions/group-assignment"
+              $ref: "#/getDefinitions/hpa-capability"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -5678,41 +4923,27 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: group-id
+        - name: flavor-id
           in: path
-          description: Group id, expected to be unique across cloud-region.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __GROUP-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: group-type
-          in: query
-          description: Group type - the type of group this instance refers to
-          required: false
-          type: string
-        - name: group-name
-          in: query
-          description: Group name - name assigned to the group
-          required: false
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
           type: string
+          example: __HPA-CAPABILITY-ID__
     put:
       tags:
         - CloudInfrastructure
-      summary: create or update an existing group-assignment
+      summary: create or update an existing hpa-capability
       description: |
-        Create or update an existing group-assignment.
+        Create or update an existing hpa-capability.
         #
         Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapability
       consumes:
         - application/json
         - application/xml
@@ -5735,24 +4966,30 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: group-id
+        - name: flavor-id
           in: path
-          description: Group id, expected to be unique across cloud-region.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __GROUP-ID__
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
         - name: body
           in: body
-          description: group-assignment object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment.json)
+          description: hpa-capability object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapability.json)
           required: true
           schema:
-            $ref: "#/definitions/group-assignment"
+            $ref: "#/definitions/hpa-capability"
     patch:
       tags:
         - CloudInfrastructure
-      summary: update an existing group-assignment
+      summary: update an existing hpa-capability
       description: |
-        Update an existing group-assignment
+        Update an existing hpa-capability
         #
         Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
         The PUT operation will entirely replace an existing object.
@@ -5763,7 +5000,7 @@ paths:
         - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
         - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
         - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
-      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapability
       consumes:
         - application/json
         - application/xml
@@ -5786,24 +5023,30 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: group-id
+        - name: flavor-id
           in: path
-          description: Group id, expected to be unique across cloud-region.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __GROUP-ID__
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
         - name: body
           in: body
-          description: group-assignment object that needs to be created or updated. 
+          description: hpa-capability object that needs to be updated.
           required: true
           schema:
-            $ref: "#/patchDefinitions/group-assignment"
+            $ref: "#/patchDefinitions/hpa-capability"
     delete:
       tags:
         - CloudInfrastructure
-      summary: delete an existing group-assignment
-      description: delete an existing group-assignment
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
+      summary: delete an existing hpa-capability
+      description: delete an existing hpa-capability
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapability
       consumes:
         - application/json
         - application/xml
@@ -5826,24 +5069,30 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: group-id
+        - name: flavor-id
           in: path
-          description: Group id, expected to be unique across cloud-region.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __GROUP-ID__
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
         - name: resource-version
           in: query
           description: resource-version for concurrency
           required: true
           type: string
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities:
     get:
       tags:
         - CloudInfrastructure
-      summary: returns group-assignments
-      description: returns group-assignments
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionGroupAssignments
+      summary: returns hpa-capabilities
+      description: returns hpa-capabilities
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilities
       produces:
         - application/json
         - application/xml
@@ -5851,7 +5100,7 @@ paths:
         "200":
           description: successful operation
           schema:
-              $ref: "#/getDefinitions/group-assignments"
+              $ref: "#/getDefinitions/hpa-capabilities"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -5867,22 +5116,33 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: cloud-type
+        - name: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
           in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
           required: false
           type: string
-        - name: owner-defined-type
+        - name: hpa-feature
           in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
           required: false
           type: string
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots/snapshot/{snapshot-id}/relationship-list/relationship:
+        - name: architecture
+          in: query
+          description:
+          required: false
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/relationship-list/relationship:
     put:
       tags:
         - CloudInfrastructure
       summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshotRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -5905,15 +5165,15 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: snapshot-id
+        - name: flavor-id
           in: path
-          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __SNAPSHOT-ID__
+          example: __FLAVOR-ID__
         - name: body
           in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot.json)
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor.json)
           required: true
           schema:
             $ref: "#/definitions/relationship"
@@ -5922,7 +5182,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshotRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -5945,19 +5205,19 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: snapshot-id
+        - name: flavor-id
           in: path
-          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __SNAPSHOT-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots/snapshot/{snapshot-id}:
+          example: __FLAVOR-ID__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}:
     get:
       tags:
         - CloudInfrastructure
-      summary: returns snapshot
-      description: returns snapshot
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
+      summary: returns flavor
+      description: returns flavor
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor
       produces:
         - application/json
         - application/xml
@@ -5965,7 +5225,7 @@ paths:
         "200":
           description: successful operation
           schema:
-              $ref: "#/getDefinitions/snapshot"
+              $ref: "#/getDefinitions/flavor"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -5981,56 +5241,21 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: snapshot-id
+        - name: flavor-id
           in: path
-          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __SNAPSHOT-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: snapshot-name
-          in: query
-          description: Snapshot name
-          required: false
-          type: string
-        - name: application
-          in: query
-          description: The application that the image instantiates.
-          required: false
-          type: string
-        - name: application-vendor
-          in: query
-          description: The vendor of the application.
-          required: false
-          type: string
-        - name: application-version
-          in: query
-          description: The version of the application.
-          required: false
-          type: string
-        - name: prev-snapshot-id
-          in: query
-          description: This field contains the UUID of the previous snapshot (if any).
-          required: false
-          type: string
+          example: __FLAVOR-ID__
     put:
       tags:
         - CloudInfrastructure
-      summary: create or update an existing snapshot
+      summary: create or update an existing flavor
       description: |
-        Create or update an existing snapshot.
+        Create or update an existing flavor.
         #
         Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor
       consumes:
         - application/json
         - application/xml
@@ -6053,24 +5278,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: snapshot-id
+        - name: flavor-id
           in: path
-          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __SNAPSHOT-ID__
+          example: __FLAVOR-ID__
         - name: body
           in: body
-          description: snapshot object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot.json)
+          description: flavor object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor.json)
           required: true
           schema:
-            $ref: "#/definitions/snapshot"
+            $ref: "#/definitions/flavor"
     patch:
       tags:
         - CloudInfrastructure
-      summary: update an existing snapshot
+      summary: update an existing flavor
       description: |
-        Update an existing snapshot
+        Update an existing flavor
         #
         Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
         The PUT operation will entirely replace an existing object.
@@ -6081,7 +5306,7 @@ paths:
         - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
         - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
         - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
-      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor
       consumes:
         - application/json
         - application/xml
@@ -6104,24 +5329,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: snapshot-id
+        - name: flavor-id
           in: path
-          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __SNAPSHOT-ID__
+          example: __FLAVOR-ID__
         - name: body
           in: body
-          description: snapshot object that needs to be created or updated. 
+          description: flavor object that needs to be updated.
           required: true
           schema:
-            $ref: "#/patchDefinitions/snapshot"
+            $ref: "#/patchDefinitions/flavor"
     delete:
       tags:
         - CloudInfrastructure
-      summary: delete an existing snapshot
-      description: delete an existing snapshot
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
+      summary: delete an existing flavor
+      description: delete an existing flavor
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor
       consumes:
         - application/json
         - application/xml
@@ -6144,24 +5369,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: snapshot-id
+        - name: flavor-id
           in: path
-          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          description: Flavor id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __SNAPSHOT-ID__
+          example: __FLAVOR-ID__
         - name: resource-version
           in: query
           description: resource-version for concurrency
           required: true
           type: string
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors:
     get:
       tags:
         - CloudInfrastructure
-      summary: returns snapshots
-      description: returns snapshots
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionSnapshots
+      summary: returns flavors
+      description: returns flavors
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionFlavors
       produces:
         - application/json
         - application/xml
@@ -6169,7 +5394,7 @@ paths:
         "200":
           description: successful operation
           schema:
-              $ref: "#/getDefinitions/snapshots"
+              $ref: "#/getDefinitions/flavors"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -6185,22 +5410,22 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: cloud-type
+        - name: flavor-id
           in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
           required: false
           type: string
-        - name: owner-defined-type
+        - name: flavor-name
           in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
           required: false
           type: string
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/relationship-list/relationship:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}/relationship-list/relationship:
     put:
       tags:
         - CloudInfrastructure
       summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionImagesImageRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignmentRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -6223,15 +5448,15 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: image-id
+        - name: group-id
           in: path
-          description: Image id, expected to be unique across cloud region
+          description: Group id, expected to be unique across cloud-region.
           required: true
           type: string
-          example: __IMAGE-ID__
+          example: __GROUP-ID__
         - name: body
           in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionImagesImage.json)
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment.json)
           required: true
           schema:
             $ref: "#/definitions/relationship"
@@ -6240,7 +5465,419 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImageRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignmentRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: group-id
+          in: path
+          description: Group id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __GROUP-ID__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns group-assignment
+      description: returns group-assignment
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/group-assignment"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: group-id
+          in: path
+          description: Group id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __GROUP-ID__
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing group-assignment
+      description: |
+        Create or update an existing group-assignment.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: group-id
+          in: path
+          description: Group id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __GROUP-ID__
+        - name: body
+          in: body
+          description: group-assignment object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment.json)
+          required: true
+          schema:
+            $ref: "#/definitions/group-assignment"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing group-assignment
+      description: |
+        Update an existing group-assignment
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: group-id
+          in: path
+          description: Group id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __GROUP-ID__
+        - name: body
+          in: body
+          description: group-assignment object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/group-assignment"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing group-assignment
+      description: delete an existing group-assignment
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: group-id
+          in: path
+          description: Group id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __GROUP-ID__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns group-assignments
+      description: returns group-assignments
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionGroupAssignments
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/group-assignments"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: group-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: group-type
+          in: query
+          description:
+          required: false
+          type: string
+        - name: group-name
+          in: query
+          description:
+          required: false
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots/snapshot/{snapshot-id}/relationship-list/relationship:
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshotRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: snapshot-id
+          in: path
+          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          required: true
+          type: string
+          example: __SNAPSHOT-ID__
+        - name: body
+          in: body
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshotRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: snapshot-id
+          in: path
+          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          required: true
+          type: string
+          example: __SNAPSHOT-ID__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots/snapshot/{snapshot-id}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns snapshot
+      description: returns snapshot
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/snapshot"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: snapshot-id
+          in: path
+          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          required: true
+          type: string
+          example: __SNAPSHOT-ID__
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing snapshot
+      description: |
+        Create or update an existing snapshot.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: snapshot-id
+          in: path
+          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          required: true
+          type: string
+          example: __SNAPSHOT-ID__
+        - name: body
+          in: body
+          description: snapshot object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot.json)
+          required: true
+          schema:
+            $ref: "#/definitions/snapshot"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing snapshot
+      description: |
+        Update an existing snapshot
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
       consumes:
         - application/json
         - application/xml
@@ -6263,27 +5900,31 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: image-id
+        - name: snapshot-id
           in: path
-          description: Image id, expected to be unique across cloud region
+          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
           required: true
           type: string
-          example: __IMAGE-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/metadata/metadatum/{metaname}:
-    get:
+          example: __SNAPSHOT-ID__
+        - name: body
+          in: body
+          description: snapshot object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/snapshot"
+    delete:
       tags:
         - CloudInfrastructure
-      summary: returns metadatum
-      description: returns metadatum
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
+      summary: delete an existing snapshot
+      description: delete an existing snapshot
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
+      consumes:
+        - application/json
+        - application/xml
       produces:
         - application/json
         - application/xml
       responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/metadatum"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -6299,47 +5940,192 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: image-id
+        - name: snapshot-id
           in: path
-          description: Image id, expected to be unique across cloud region
+          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
           required: true
           type: string
-          example: __IMAGE-ID__
-        - name: metaname
+          example: __SNAPSHOT-ID__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns snapshots
+      description: returns snapshots
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionSnapshots
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/snapshots"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
           in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
           required: true
           type: string
-          example: __METANAME__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
           type: string
-        - name: owner-defined-type
+          example: __CLOUD-REGION-ID__
+        - name: snapshot-id
           in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
           required: false
           type: string
-        - name: image-name
+        - name: snapshot-name
           in: query
-          description: Image name
+          description:
           required: false
           type: string
         - name: application
           in: query
-          description: The application that the image instantiates.
+          description:
           required: false
           type: string
         - name: application-vendor
           in: query
-          description: The vendor of the application.
+          description:
           required: false
           type: string
         - name: application-version
           in: query
-          description: The version of the application.
+          description:
+          required: false
+          type: string
+        - name: prev-snapshot-id
+          in: query
+          description:
           required: false
           type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/relationship-list/relationship:
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionImagesImageRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: image-id
+          in: path
+          description: Image id, expected to be unique across cloud region
+          required: true
+          type: string
+          example: __IMAGE-ID__
+        - name: body
+          in: body
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionImagesImage.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImageRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: image-id
+          in: path
+          description: Image id, expected to be unique across cloud region
+          required: true
+          type: string
+          example: __IMAGE-ID__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/metadata/metadatum/{metaname}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns metadatum
+      description: returns metadatum
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/metadatum"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: image-id
+          in: path
+          description: Image id, expected to be unique across cloud region
+          required: true
+          type: string
+          example: __IMAGE-ID__
+        - name: metaname
+          in: path
+          required: true
+          type: string
+          example: __METANAME__
     put:
       tags:
         - CloudInfrastructure
@@ -6440,7 +6226,7 @@ paths:
           example: __METANAME__
         - name: body
           in: body
-          description: metadatum object that needs to be created or updated. 
+          description: metadatum object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/metadatum"
@@ -6524,34 +6310,9 @@ paths:
           required: true
           type: string
           example: __IMAGE-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: image-name
-          in: query
-          description: Image name
-          required: false
-          type: string
-        - name: application
-          in: query
-          description: The application that the image instantiates.
-          required: false
-          type: string
-        - name: application-vendor
-          in: query
-          description: The vendor of the application.
-          required: false
-          type: string
-        - name: application-version
+        - name: metaname
           in: query
-          description: The version of the application.
+          description:
           required: false
           type: string
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}:
@@ -6590,36 +6351,6 @@ paths:
           required: true
           type: string
           example: __IMAGE-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: image-name
-          in: query
-          description: Image name
-          required: false
-          type: string
-        - name: application
-          in: query
-          description: The application that the image instantiates.
-          required: false
-          type: string
-        - name: application-vendor
-          in: query
-          description: The vendor of the application.
-          required: false
-          type: string
-        - name: application-version
-          in: query
-          description: The version of the application.
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -6710,7 +6441,7 @@ paths:
           example: __IMAGE-ID__
         - name: body
           in: body
-          description: image object that needs to be created or updated. 
+          description: image object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/image"
@@ -6783,14 +6514,29 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: cloud-type
+        - name: image-id
           in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
           required: false
           type: string
-        - name: owner-defined-type
+        - name: image-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: application
           in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
+          required: false
+          type: string
+        - name: application-vendor
+          in: query
+          description:
+          required: false
+          type: string
+        - name: application-version
+          in: query
+          description:
           required: false
           type: string
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name}/relationship-list/relationship:
@@ -6903,21 +6649,6 @@ paths:
           required: true
           type: string
           example: __SWITCH-NAME__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: vcenter-url
-          in: query
-          description: URL used to reach the vcenter
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -7008,7 +6739,7 @@ paths:
           example: __SWITCH-NAME__
         - name: body
           in: body
-          description: dvs-switch object that needs to be created or updated. 
+          description: dvs-switch object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/dvs-switch"
@@ -7081,14 +6812,14 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: cloud-type
+        - name: switch-name
           in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
           required: false
           type: string
-        - name: owner-defined-type
+        - name: vcenter-url
           in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
           required: false
           type: string
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks/oam-network/{network-uuid}/relationship-list/relationship:
@@ -7201,27 +6932,6 @@ paths:
           required: true
           type: string
           example: __NETWORK-UUID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network.
-          required: false
-          type: string
-        - name: cvlan-tag
-          in: query
-          description: cvlan-id
-          required: false
-          type: integer
-          format: int64
     put:
       tags:
         - CloudInfrastructure
@@ -7312,7 +7022,7 @@ paths:
           example: __NETWORK-UUID__
         - name: body
           in: body
-          description: oam-network object that needs to be created or updated. 
+          description: oam-network object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/oam-network"
@@ -7385,16 +7095,22 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: cloud-type
+        - name: network-uuid
           in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
           required: false
           type: string
-        - name: owner-defined-type
+        - name: network-name
           in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
           required: false
           type: string
+        - name: cvlan-tag
+          in: query
+          description:
+          required: false
+          type: integer
+          format: int64
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/availability-zones/availability-zone/{availability-zone-name}/relationship-list/relationship:
     put:
       tags:
@@ -7505,16 +7221,6 @@ paths:
           required: true
           type: string
           example: __AVAILABILITY-ZONE-NAME__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -7605,7 +7311,7 @@ paths:
           example: __AVAILABILITY-ZONE-NAME__
         - name: body
           in: body
-          description: availability-zone object that needs to be created or updated. 
+          description: availability-zone object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/availability-zone"
@@ -7678,14 +7384,9 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
+        - name: availability-zone-name
           in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
           required: false
           type: string
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/relationship-list/relationship:
@@ -7860,32 +7561,6 @@ paths:
           required: true
           type: string
           example: __VIP-IPV4-ADDRESS__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -7976,7 +7651,7 @@ paths:
           example: __VIP-IPV4-ADDRESS__
         - name: body
           in: body
-          description: vip-ipv4-address-list object that needs to be created or updated. 
+          description: vip-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vip-ipv4-address-list"
@@ -8129,32 +7804,6 @@ paths:
           required: true
           type: string
           example: __VIP-IPV6-ADDRESS__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
-          type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -8237,24 +7886,546 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: vip-ipv6-address
+          in: path
+          description: IP address
+          required: true
+          type: string
+          example: __VIP-IPV6-ADDRESS__
+        - name: body
+          in: body
+          description: vip-ipv6-address-list object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/vip-ipv6-address-list"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing vip-ipv6-address-list
+      description: delete an existing vip-ipv6-address-list
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: vip-ipv6-address
+          in: path
+          description: IP address
+          required: true
+          type: string
+          example: __VIP-IPV6-ADDRESS__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship:
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: body
+          in: body
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship:
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributesRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributesRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns hpa-feature-attributes
+      description: returns hpa-feature-attributes
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/hpa-feature-attributes"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing hpa-feature-attributes
+      description: |
+        Create or update an existing hpa-feature-attributes.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing hpa-feature-attributes
+      description: |
+        Update an existing hpa-feature-attributes
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing hpa-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns hpa-capability
+      description: returns hpa-capability
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/hpa-capability"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing hpa-capability
+      description: |
+        Create or update an existing hpa-capability.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
           in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
           required: true
           type: string
-          example: __VIP-IPV6-ADDRESS__
+          example: __HPA-CAPABILITY-ID__
         - name: body
           in: body
-          description: vip-ipv6-address-list object that needs to be created or updated. 
+          description: hpa-capability object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability.json)
           required: true
           schema:
-            $ref: "#/patchDefinitions/vip-ipv6-address-list"
+            $ref: "#/definitions/hpa-capability"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing hpa-capability
+      description: |
+        Update an existing hpa-capability
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: body
+          in: body
+          description: hpa-capability object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/hpa-capability"
     delete:
       tags:
         - CloudInfrastructure
-      summary: delete an existing vip-ipv6-address-list
-      description: delete an existing vip-ipv6-address-list
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
+      summary: delete an existing hpa-capability
+      description: delete an existing hpa-capability
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
       consumes:
         - application/json
         - application/xml
@@ -8277,24 +8448,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: hpa-capability-id
           in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
           required: true
           type: string
-          example: __VIP-IPV6-ADDRESS__
+          example: __HPA-CAPABILITY-ID__
         - name: resource-version
           in: query
           description: resource-version for concurrency
           required: true
           type: string
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities:
     get:
       tags:
         - CloudInfrastructure
-      summary: returns cloud-region
-      description: returns cloud-region
-      operationId: getCloudInfrastructureCloudRegionsCloudRegion
+      summary: returns hpa-capabilities
+      description: returns hpa-capabilities
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionHpaCapabilities
       produces:
         - application/json
         - application/xml
@@ -8302,7 +8473,7 @@ paths:
         "200":
           description: successful operation
           schema:
-              $ref: "#/getDefinitions/cloud-region"
+              $ref: "#/getDefinitions/hpa-capabilities"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -8318,16 +8489,51 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: cloud-type
+        - name: hpa-capability-id
           in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
           required: false
           type: string
-        - name: owner-defined-type
+        - name: hpa-feature
+          in: query
+          description:
+          required: false
+          type: string
+        - name: architecture
           in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
           required: false
           type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns cloud-region
+      description: returns cloud-region
+      operationId: getCloudInfrastructureCloudRegionsCloudRegion
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/cloud-region"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
     put:
       tags:
         - CloudInfrastructure
@@ -8406,7 +8612,7 @@ paths:
           example: __CLOUD-REGION-ID__
         - name: body
           in: body
-          description: cloud-region object that needs to be created or updated. 
+          description: cloud-region object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/cloud-region"
@@ -8460,6 +8666,27 @@ paths:
               $ref: "#/getDefinitions/cloud-regions"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: query
+          description:
+          required: false
+          type: string
+        - name: cloud-region-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: cloud-type
+          in: query
+          description:
+          required: false
+          type: string
+        - name: owner-defined-type
+          in: query
+          description:
+          required: false
+          type: string
   /cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}/relationship-list/relationship:
     put:
       tags:
@@ -8600,7 +8827,7 @@ paths:
           example: __NM-PROFILE-NAME__
         - name: body
           in: body
-          description: network-profile object that needs to be created or updated. 
+          description: network-profile object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/network-profile"
@@ -8648,6 +8875,12 @@ paths:
               $ref: "#/getDefinitions/network-profiles"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: nm-profile-name
+          in: query
+          description:
+          required: false
+          type: string
   /cloud-infrastructure/pservers/pserver/{hostname}/relationship-list/relationship:
     put:
       tags:
@@ -8870,30 +9103,6 @@ paths:
           required: true
           type: string
           example: __PF-PCI-ID__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -8984,7 +9193,7 @@ paths:
           example: __PF-PCI-ID__
         - name: body
           in: body
-          description: sriov-pf object that needs to be created or updated. 
+          description: sriov-pf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-pf"
@@ -9057,28 +9266,9 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: prov-status
+        - name: pf-pci-id
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
   /cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/relationship-list/relationship:
@@ -9313,72 +9503,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -9493,7 +9617,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -9694,72 +9818,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -9874,7 +9932,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -9971,56 +10029,6 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -10123,7 +10131,7 @@ paths:
           example: __VLAN-INTERFACE__
         - name: body
           in: body
-          description: vlan object that needs to be created or updated. 
+          description: vlan object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vlan"
@@ -10208,43 +10216,20 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
+        - name: vlan-interface
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vlan-id-inner
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: integer
+          format: int64
+        - name: vpn-key
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}/relationship-list/relationship:
@@ -10375,74 +10360,118 @@ paths:
           required: true
           type: string
           example: __PCI-ID__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing sriov-vf
+      description: |
+        Create or update an existing sriov-vf.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructurePserversPserverPInterfacesPInterfaceLInterfacesLInterfaceSriovVfsSriovVf
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: hostname
+          in: path
+          description: Value from executing hostname on the compute node.
+          required: true
           type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
+          example: __HOSTNAME__
+        - name: interface-name
+          in: path
+          description: Name that identifies the physical interface
+          required: true
           type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
+          example: __INTERFACE-NAME__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
           type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
+          example: __INTERFACE-NAME__
+        - name: pci-id
+          in: path
+          description: PCI ID used to identify the sriov-vf
+          required: true
           type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
+          example: __PCI-ID__
+        - name: body
+          in: body
+          description: sriov-vf object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructurePserversPserverPInterfacesPInterfaceLInterfacesLInterfaceSriovVfsSriovVf.json)
+          required: true
+          schema:
+            $ref: "#/definitions/sriov-vf"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing sriov-vf
+      description: |
+        Update an existing sriov-vf
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructurePserversPserverPInterfacesPInterfaceLInterfacesLInterfaceSriovVfsSriovVf
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: hostname
+          in: path
+          description: Value from executing hostname on the compute node.
+          required: true
           type: string
-        - name: vf-vlan-filter
-          in: query
-          description: This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.
-          required: false
+          example: __HOSTNAME__
+        - name: interface-name
+          in: path
+          description: Name that identifies the physical interface
+          required: true
           type: string
-        - name: vf-mac-filter
-          in: query
-          description: When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.
-          required: false
+          example: __INTERFACE-NAME__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
           type: string
-        - name: vf-vlan-strip
-          in: query
-          description: When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.
-          required: false
-          type: boolean
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface
-          required: false
+          example: __INTERFACE-NAME__
+        - name: pci-id
+          in: path
+          description: PCI ID used to identify the sriov-vf
+          required: true
           type: string
-    put:
+          example: __PCI-ID__
+        - name: body
+          in: body
+          description: sriov-vf object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/sriov-vf"
+    delete:
       tags:
         - CloudInfrastructure
-      summary: create or update an existing sriov-vf
-      description: |
-        Create or update an existing sriov-vf.
-        #
-        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
-      operationId: createOrUpdateCloudInfrastructurePserversPserverPInterfacesPInterfaceLInterfacesLInterfaceSriovVfsSriovVf
+      summary: delete an existing sriov-vf
+      description: delete an existing sriov-vf
+      operationId: deleteCloudInfrastructurePserversPserverPInterfacesPInterfaceLInterfacesLInterfaceSriovVfsSriovVf
       consumes:
         - application/json
         - application/xml
@@ -10472,192 +10501,75 @@ paths:
           type: string
           example: __INTERFACE-NAME__
         - name: pci-id
-          in: path
-          description: PCI ID used to identify the sriov-vf
-          required: true
-          type: string
-          example: __PCI-ID__
-        - name: body
-          in: body
-          description: sriov-vf object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructurePserversPserverPInterfacesPInterfaceLInterfacesLInterfaceSriovVfsSriovVf.json)
-          required: true
-          schema:
-            $ref: "#/definitions/sriov-vf"
-    patch:
-      tags:
-        - CloudInfrastructure
-      summary: update an existing sriov-vf
-      description: |
-        Update an existing sriov-vf
-        #
-        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
-        The PUT operation will entirely replace an existing object.
-        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
-        #
-        Other differences between PUT and PATCH are:
-        #
-        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
-        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
-        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
-      operationId: UpdateCloudInfrastructurePserversPserverPInterfacesPInterfaceLInterfacesLInterfaceSriovVfsSriovVf
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: hostname
-          in: path
-          description: Value from executing hostname on the compute node.
-          required: true
-          type: string
-          example: __HOSTNAME__
-        - name: interface-name
-          in: path
-          description: Name that identifies the physical interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: interface-name
-          in: path
-          description: Name given to the interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: pci-id
-          in: path
-          description: PCI ID used to identify the sriov-vf
-          required: true
-          type: string
-          example: __PCI-ID__
-        - name: body
-          in: body
-          description: sriov-vf object that needs to be created or updated. 
-          required: true
-          schema:
-            $ref: "#/patchDefinitions/sriov-vf"
-    delete:
-      tags:
-        - CloudInfrastructure
-      summary: delete an existing sriov-vf
-      description: delete an existing sriov-vf
-      operationId: deleteCloudInfrastructurePserversPserverPInterfacesPInterfaceLInterfacesLInterfaceSriovVfsSriovVf
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: hostname
-          in: path
-          description: Value from executing hostname on the compute node.
-          required: true
-          type: string
-          example: __HOSTNAME__
-        - name: interface-name
-          in: path
-          description: Name that identifies the physical interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: interface-name
-          in: path
-          description: Name given to the interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: pci-id
-          in: path
-          description: PCI ID used to identify the sriov-vf
-          required: true
-          type: string
-          example: __PCI-ID__
-        - name: resource-version
+          in: path
+          description: PCI ID used to identify the sriov-vf
+          required: true
+          type: string
+          example: __PCI-ID__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns sriov-vfs
+      description: returns sriov-vfs
+      operationId: getCloudInfrastructurePserversPserverPInterfacesPInterfaceLInterfacesLInterfaceSriovVfs
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/sriov-vfs"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: hostname
+          in: path
+          description: Value from executing hostname on the compute node.
+          required: true
+          type: string
+          example: __HOSTNAME__
+        - name: interface-name
+          in: path
+          description: Name that identifies the physical interface
+          required: true
+          type: string
+          example: __INTERFACE-NAME__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
+          type: string
+          example: __INTERFACE-NAME__
+        - name: pci-id
           in: query
-          description: resource-version for concurrency
-          required: true
-          type: string
-  /cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs:
-    get:
-      tags:
-        - CloudInfrastructure
-      summary: returns sriov-vfs
-      description: returns sriov-vfs
-      operationId: getCloudInfrastructurePserversPserverPInterfacesPInterfaceLInterfacesLInterfaceSriovVfs
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/sriov-vfs"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: hostname
-          in: path
-          description: Value from executing hostname on the compute node.
-          required: true
-          type: string
-          example: __HOSTNAME__
-        - name: interface-name
-          in: path
-          description: Name that identifies the physical interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: interface-name
-          in: path
-          description: Name given to the interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: vf-vlan-filter
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: interface-id
+        - name: vf-mac-filter
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vf-vlan-strip
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: boolean
+        - name: neutron-network-id
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/relationship-list/relationship:
@@ -10862,61 +10774,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -11019,7 +10876,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -11196,61 +11053,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -11353,7 +11155,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -11438,45 +11240,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -11567,7 +11330,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: l-interface object that needs to be created or updated. 
+          description: l-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l-interface"
@@ -11640,28 +11403,24 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
+        - name: interface-name
           in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
+          description:
           required: false
           type: string
-        - name: pserver-id
+        - name: interface-id
           in: query
-          description: ID of Pserver
+          description:
           required: false
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
+        - name: macaddr
           in: query
-          description: alternative pserver name
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: network-name
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
   /cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}:
@@ -11694,30 +11453,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -11796,7 +11531,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: p-interface object that needs to be created or updated. 
+          description: p-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/p-interface"
@@ -11857,23 +11592,14 @@ paths:
           required: true
           type: string
           example: __HOSTNAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
+        - name: interface-name
           in: query
-          description: ID of Pserver
+          description:
           required: false
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
+        - name: prov-status
           in: query
-          description: alternative pserver name
+          description:
           required: false
           type: string
   /cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/relationship-list/relationship:
@@ -12170,77 +11896,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -12355,7 +12010,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -12556,77 +12211,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -12741,7 +12325,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -12838,61 +12422,6 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -12995,7 +12524,7 @@ paths:
           example: __VLAN-INTERFACE__
         - name: body
           in: body
-          description: vlan object that needs to be created or updated. 
+          description: vlan object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vlan"
@@ -13033,95 +12562,67 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vlan-interface
-          in: path
-          description: String that identifies the interface
-          required: true
-          type: string
-          example: __VLAN-INTERFACE__
-        - name: resource-version
-          in: query
-          description: resource-version for concurrency
-          required: true
-          type: string
-  /cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans:
-    get:
-      tags:
-        - CloudInfrastructure
-      summary: returns vlans
-      description: returns vlans
-      operationId: getCloudInfrastructurePserversPserverLagInterfacesLagInterfaceLInterfacesLInterfaceVlans
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/vlans"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: hostname
-          in: path
-          description: Value from executing hostname on the compute node.
-          required: true
-          type: string
-          example: __HOSTNAME__
-        - name: interface-name
-          in: path
-          description: Name that identifies the link aggregate interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: interface-name
-          in: path
-          description: Name given to the interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
+        - name: vlan-interface
+          in: path
+          description: String that identifies the interface
+          required: true
           type: string
-        - name: pserver-id
+          example: __VLAN-INTERFACE__
+        - name: resource-version
           in: query
-          description: ID of Pserver
-          required: false
+          description: resource-version for concurrency
+          required: true
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
+  /cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns vlans
+      description: returns vlans
+      operationId: getCloudInfrastructurePserversPserverLagInterfacesLagInterfaceLInterfacesLInterfaceVlans
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/vlans"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: hostname
+          in: path
+          description: Value from executing hostname on the compute node.
+          required: true
           type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
+          example: __HOSTNAME__
+        - name: interface-name
+          in: path
+          description: Name that identifies the link aggregate interface
+          required: true
           type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
+          example: __INTERFACE-NAME__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
           type: string
-        - name: interface-id
+          example: __INTERFACE-NAME__
+        - name: vlan-interface
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vlan-id-inner
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: integer
+          format: int64
+        - name: vpn-key
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}/relationship-list/relationship:
@@ -13252,70 +12753,6 @@ paths:
           required: true
           type: string
           example: __PCI-ID__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vf-vlan-filter
-          in: query
-          description: This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.
-          required: false
-          type: string
-        - name: vf-mac-filter
-          in: query
-          description: When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.
-          required: false
-          type: string
-        - name: vf-vlan-strip
-          in: query
-          description: When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.
-          required: false
-          type: boolean
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -13418,7 +12855,7 @@ paths:
           example: __PCI-ID__
         - name: body
           in: body
-          description: sriov-vf object that needs to be created or updated. 
+          description: sriov-vf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-vf"
@@ -13503,48 +12940,29 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: interface-id
+        - name: pci-id
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: interface-role
+        - name: vf-vlan-filter
           in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
+          description:
           required: false
           type: string
-        - name: interface-id
+        - name: vf-mac-filter
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vf-vlan-strip
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: boolean
+        - name: neutron-network-id
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/relationship-list/relationship:
@@ -13749,66 +13167,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -13911,7 +13269,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -14088,66 +13446,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -14250,7 +13548,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -14335,50 +13633,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -14469,7 +13723,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: l-interface object that needs to be created or updated. 
+          description: l-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l-interface"
@@ -14542,33 +13796,24 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
+        - name: interface-name
           in: query
-          description: ID of Pserver
+          description:
           required: false
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
+        - name: interface-id
           in: query
-          description: alternative pserver name
+          description:
           required: false
           type: string
-        - name: interface-id
+        - name: macaddr
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: interface-role
+        - name: network-name
           in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
+          description:
           required: false
           type: string
   /cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{interface-name}:
@@ -14601,35 +13846,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -14708,7 +13924,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: lag-interface object that needs to be created or updated. 
+          description: lag-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/lag-interface"
@@ -14769,23 +13985,19 @@ paths:
           required: true
           type: string
           example: __HOSTNAME__
-        - name: inv-status
+        - name: interface-name
           in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
+          description:
           required: false
           type: string
-        - name: pserver-id
+        - name: interface-id
           in: query
-          description: ID of Pserver
+          description:
           required: false
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
+        - name: interface-role
           in: query
-          description: alternative pserver name
+          description:
           required: false
           type: string
   /cloud-infrastructure/pservers/pserver/{hostname}:
@@ -14812,25 +14024,6 @@ paths:
           required: true
           type: string
           example: __HOSTNAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: pserver-id
-          in: query
-          description: ID of Pserver
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: pserver-name2
-          in: query
-          description: alternative pserver name
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -14897,7 +14090,7 @@ paths:
           example: __HOSTNAME__
         - name: body
           in: body
-          description: pserver object that needs to be created or updated. 
+          description: pserver object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/pserver"
@@ -14945,6 +14138,32 @@ paths:
               $ref: "#/getDefinitions/pservers"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: hostname
+          in: query
+          description:
+          required: false
+          type: string
+        - name: inv-status
+          in: query
+          description:
+          required: false
+          type: string
+        - name: pserver-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: in-maint
+          in: query
+          description:
+          required: false
+          type: boolean
+        - name: pserver-name2
+          in: query
+          description:
+          required: false
+          type: string
   /cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}/relationship-list/relationship:
     put:
       tags:
@@ -15019,11 +14238,6 @@ paths:
           required: true
           type: string
           example: __VDC-ID__
-        - name: vdc-name
-          in: query
-          description: Name of the virtual data center
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
@@ -15090,7 +14304,7 @@ paths:
           example: __VDC-ID__
         - name: body
           in: body
-          description: virtual-data-center object that needs to be created or updated. 
+          description: virtual-data-center object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/virtual-data-center"
@@ -15138,6 +14352,17 @@ paths:
               $ref: "#/getDefinitions/virtual-data-centers"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: vdc-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vdc-name
+          in: query
+          description:
+          required: false
+          type: string
   /cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}/relationship-list/relationship:
     put:
       tags:
@@ -15278,7 +14503,7 @@ paths:
           example: __OPERATIONAL-ENVIRONMENT-ID__
         - name: body
           in: body
-          description: operational-environment object that needs to be created or updated. 
+          description: operational-environment object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/operational-environment"
@@ -15326,6 +14551,12 @@ paths:
               $ref: "#/getDefinitions/operational-environments"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: operational-environment-id
+          in: query
+          description:
+          required: false
+          type: string
   /business/connectors/connector/{resource-instance-id}/relationship-list/relationship:
     put:
       tags:
@@ -15405,26 +14636,6 @@ paths:
           required: true
           type: string
           example: __METANAME__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
     put:
       tags:
         - Business
@@ -15501,7 +14712,7 @@ paths:
           example: __METANAME__
         - name: body
           in: body
-          description: metadatum object that needs to be created or updated. 
+          description: metadatum object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/metadatum"
@@ -15561,24 +14772,9 @@ paths:
           required: true
           type: string
           example: __RESOURCE-INSTANCE-ID__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
+        - name: metaname
           in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
+          description:
           required: false
           type: string
   /business/connectors/connector/{resource-instance-id}:
@@ -15605,26 +14801,6 @@ paths:
           required: true
           type: string
           example: __RESOURCE-INSTANCE-ID__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
     put:
       tags:
         - Business
@@ -15691,7 +14867,7 @@ paths:
           example: __RESOURCE-INSTANCE-ID__
         - name: body
           in: body
-          description: connector object that needs to be created or updated. 
+          description: connector object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/connector"
@@ -15739,6 +14915,32 @@ paths:
               $ref: "#/getDefinitions/connectors"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: resource-instance-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-invariant-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-version-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: widget-model-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: widget-model-version
+          in: query
+          description:
+          required: false
+          type: string
   /business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/relationship-list/relationship:
     put:
       tags:
@@ -15854,61 +15056,6 @@ paths:
           required: true
           type: string
           example: __METANAME__
-        - name: subscriber-name
-          in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
-          required: false
-          type: string
-        - name: subscriber-type
-          in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
-          required: false
-          type: string
-        - name: service-instance-name
-          in: query
-          description: This field will store a name assigned to the service-instance.
-          required: false
-          type: string
-        - name: environment-context
-          in: query
-          description: This field will store the environment context assigned to the service-instance.
-          required: false
-          type: string
-        - name: workload-context
-          in: query
-          description: This field will store the workload context assigned to the service-instance.
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: service-instance-location-id
-          in: query
-          description: An identifier that customers assign to the location where this service is being used.
-          required: false
-          type: string
-        - name: orchestration-status
-          in: query
-          description: Orchestration status of this service.
-          required: false
-          type: string
     put:
       tags:
         - Business
@@ -16009,7 +15156,7 @@ paths:
           example: __METANAME__
         - name: body
           in: body
-          description: metadatum object that needs to be created or updated. 
+          description: metadatum object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/metadatum"
@@ -16047,105 +15194,55 @@ paths:
           required: true
           type: string
           example: __SERVICE-INSTANCE-ID__
-        - name: metaname
-          in: path
-          required: true
-          type: string
-          example: __METANAME__
-        - name: resource-version
-          in: query
-          description: resource-version for concurrency
-          required: true
-          type: string
-  /business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/metadata:
-    get:
-      tags:
-        - Business
-      summary: returns metadata
-      description: returns metadata
-      operationId: getBusinessCustomersCustomerServiceSubscriptionsServiceSubscriptionServiceInstancesServiceInstanceMetadata
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/metadata"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: global-customer-id
-          in: path
-          description: Global customer id used across ECOMP to uniquely identify customer.
-          required: true
-          type: string
-          example: __GLOBAL-CUSTOMER-ID__
-        - name: service-type
-          in: path
-          description: Value defined by orchestration to identify this service across ECOMP.
-          required: true
-          type: string
-          example: __SERVICE-TYPE__
-        - name: service-instance-id
-          in: path
-          description: Uniquely identifies this instance of a service
-          required: true
-          type: string
-          example: __SERVICE-INSTANCE-ID__
-        - name: subscriber-name
-          in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
-          required: false
-          type: string
-        - name: subscriber-type
-          in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
-          required: false
-          type: string
-        - name: service-instance-name
-          in: query
-          description: This field will store a name assigned to the service-instance.
-          required: false
-          type: string
-        - name: environment-context
-          in: query
-          description: This field will store the environment context assigned to the service-instance.
-          required: false
-          type: string
-        - name: workload-context
-          in: query
-          description: This field will store the workload context assigned to the service-instance.
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
+        - name: metaname
+          in: path
+          required: true
           type: string
-        - name: model-version-id
+          example: __METANAME__
+        - name: resource-version
           in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
+          description: resource-version for concurrency
+          required: true
           type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
+  /business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/metadata:
+    get:
+      tags:
+        - Business
+      summary: returns metadata
+      description: returns metadata
+      operationId: getBusinessCustomersCustomerServiceSubscriptionsServiceSubscriptionServiceInstancesServiceInstanceMetadata
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/metadata"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: global-customer-id
+          in: path
+          description: Global customer id used across ECOMP to uniquely identify customer.
+          required: true
           type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
+          example: __GLOBAL-CUSTOMER-ID__
+        - name: service-type
+          in: path
+          description: Value defined by orchestration to identify this service across ECOMP.
+          required: true
           type: string
-        - name: service-instance-location-id
-          in: query
-          description: An identifier that customers assign to the location where this service is being used.
-          required: false
+          example: __SERVICE-TYPE__
+        - name: service-instance-id
+          in: path
+          description: Uniquely identifies this instance of a service
+          required: true
           type: string
-        - name: orchestration-status
+          example: __SERVICE-INSTANCE-ID__
+        - name: metaname
           in: query
-          description: Orchestration status of this service.
+          description:
           required: false
           type: string
   /business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources/allotted-resource/{id}/tunnel-xconnects/tunnel-xconnect/{id}/relationship-list/relationship:
@@ -16294,81 +15391,6 @@ paths:
           required: true
           type: string
           example: __ID__
-        - name: subscriber-name
-          in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
-          required: false
-          type: string
-        - name: subscriber-type
-          in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
-          required: false
-          type: string
-        - name: service-instance-name
-          in: query
-          description: This field will store a name assigned to the service-instance.
-          required: false
-          type: string
-        - name: environment-context
-          in: query
-          description: This field will store the environment context assigned to the service-instance.
-          required: false
-          type: string
-        - name: workload-context
-          in: query
-          description: This field will store the workload context assigned to the service-instance.
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: service-instance-location-id
-          in: query
-          description: An identifier that customers assign to the location where this service is being used.
-          required: false
-          type: string
-        - name: orchestration-status
-          in: query
-          description: Orchestration status of this service.
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: type
-          in: query
-          description: Generic description of the type of allotted resource.
-          required: false
-          type: string
-        - name: role
-          in: query
-          description: role in the network that this resource will be providing.
-          required: false
-          type: string
     put:
       tags:
         - Business
@@ -16483,7 +15505,7 @@ paths:
           example: __ID__
         - name: body
           in: body
-          description: tunnel-xconnect object that needs to be created or updated. 
+          description: tunnel-xconnect object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/tunnel-xconnect"
@@ -16580,79 +15602,9 @@ paths:
           required: true
           type: string
           example: __ID__
-        - name: subscriber-name
-          in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
-          required: false
-          type: string
-        - name: subscriber-type
-          in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
-          required: false
-          type: string
-        - name: service-instance-name
-          in: query
-          description: This field will store a name assigned to the service-instance.
-          required: false
-          type: string
-        - name: environment-context
-          in: query
-          description: This field will store the environment context assigned to the service-instance.
-          required: false
-          type: string
-        - name: workload-context
-          in: query
-          description: This field will store the workload context assigned to the service-instance.
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: service-instance-location-id
-          in: query
-          description: An identifier that customers assign to the location where this service is being used.
-          required: false
-          type: string
-        - name: orchestration-status
-          in: query
-          description: Orchestration status of this service.
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: type
-          in: query
-          description: Generic description of the type of allotted resource.
-          required: false
-          type: string
-        - name: role
+        - name: id
           in: query
-          description: role in the network that this resource will be providing.
+          description:
           required: false
           type: string
   /business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources/allotted-resource/{id}/relationship-list/relationship:
@@ -16783,81 +15735,6 @@ paths:
           required: true
           type: string
           example: __ID__
-        - name: subscriber-name
-          in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
-          required: false
-          type: string
-        - name: subscriber-type
-          in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
-          required: false
-          type: string
-        - name: service-instance-name
-          in: query
-          description: This field will store a name assigned to the service-instance.
-          required: false
-          type: string
-        - name: environment-context
-          in: query
-          description: This field will store the environment context assigned to the service-instance.
-          required: false
-          type: string
-        - name: workload-context
-          in: query
-          description: This field will store the workload context assigned to the service-instance.
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: service-instance-location-id
-          in: query
-          description: An identifier that customers assign to the location where this service is being used.
-          required: false
-          type: string
-        - name: orchestration-status
-          in: query
-          description: Orchestration status of this service.
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: type
-          in: query
-          description: Generic description of the type of allotted resource.
-          required: false
-          type: string
-        - name: role
-          in: query
-          description: role in the network that this resource will be providing.
-          required: false
-          type: string
     put:
       tags:
         - Business
@@ -16960,7 +15837,7 @@ paths:
           example: __ID__
         - name: body
           in: body
-          description: allotted-resource object that needs to be created or updated. 
+          description: allotted-resource object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/allotted-resource"
@@ -17045,59 +15922,29 @@ paths:
           required: true
           type: string
           example: __SERVICE-INSTANCE-ID__
-        - name: subscriber-name
-          in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
-          required: false
-          type: string
-        - name: subscriber-type
-          in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
-          required: false
-          type: string
-        - name: service-instance-name
-          in: query
-          description: This field will store a name assigned to the service-instance.
-          required: false
-          type: string
-        - name: environment-context
-          in: query
-          description: This field will store the environment context assigned to the service-instance.
-          required: false
-          type: string
-        - name: workload-context
+        - name: id
           in: query
-          description: This field will store the workload context assigned to the service-instance.
+          description:
           required: false
           type: string
         - name: model-invariant-id
           in: query
-          description: the ASDC model id for this resource or service model.
+          description:
           required: false
           type: string
         - name: model-version-id
           in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
+          description:
           required: false
           type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: service-instance-location-id
+        - name: type
           in: query
-          description: An identifier that customers assign to the location where this service is being used.
+          description:
           required: false
           type: string
-        - name: orchestration-status
+        - name: role
           in: query
-          description: Orchestration status of this service.
+          description:
           required: false
           type: string
   /business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}:
@@ -17136,61 +15983,6 @@ paths:
           required: true
           type: string
           example: __SERVICE-INSTANCE-ID__
-        - name: subscriber-name
-          in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
-          required: false
-          type: string
-        - name: subscriber-type
-          in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
-          required: false
-          type: string
-        - name: service-instance-name
-          in: query
-          description: This field will store a name assigned to the service-instance.
-          required: false
-          type: string
-        - name: environment-context
-          in: query
-          description: This field will store the environment context assigned to the service-instance.
-          required: false
-          type: string
-        - name: workload-context
-          in: query
-          description: This field will store the workload context assigned to the service-instance.
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: service-instance-location-id
-          in: query
-          description: An identifier that customers assign to the location where this service is being used.
-          required: false
-          type: string
-        - name: orchestration-status
-          in: query
-          description: Orchestration status of this service.
-          required: false
-          type: string
     put:
       tags:
         - Business
@@ -17281,7 +16073,7 @@ paths:
           example: __SERVICE-INSTANCE-ID__
         - name: body
           in: body
-          description: service-instance object that needs to be created or updated. 
+          description: service-instance object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/service-instance"
@@ -17354,14 +16146,54 @@ paths:
           required: true
           type: string
           example: __SERVICE-TYPE__
-        - name: subscriber-name
+        - name: service-instance-id
           in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
+          description:
           required: false
           type: string
-        - name: subscriber-type
+        - name: service-instance-name
           in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
+          description:
+          required: false
+          type: string
+        - name: environment-context
+          in: query
+          description:
+          required: false
+          type: string
+        - name: workload-context
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-invariant-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-version-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: widget-model-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: widget-model-version
+          in: query
+          description:
+          required: false
+          type: string
+        - name: service-instance-location-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: orchestration-status
+          in: query
+          description:
           required: false
           type: string
   /business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/relationship-list/relationship:
@@ -17456,16 +16288,6 @@ paths:
           required: true
           type: string
           example: __SERVICE-TYPE__
-        - name: subscriber-name
-          in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
-          required: false
-          type: string
-        - name: subscriber-type
-          in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
-          required: false
-          type: string
     put:
       tags:
         - Business
@@ -17544,7 +16366,7 @@ paths:
           example: __SERVICE-TYPE__
         - name: body
           in: body
-          description: service-subscription object that needs to be created or updated. 
+          description: service-subscription object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/service-subscription"
@@ -17605,14 +16427,9 @@ paths:
           required: true
           type: string
           example: __GLOBAL-CUSTOMER-ID__
-        - name: subscriber-name
-          in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
-          required: false
-          type: string
-        - name: subscriber-type
+        - name: service-type
           in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
+          description:
           required: false
           type: string
   /business/customers/customer/{global-customer-id}/relationship-list/relationship:
@@ -17689,16 +16506,6 @@ paths:
           required: true
           type: string
           example: __GLOBAL-CUSTOMER-ID__
-        - name: subscriber-name
-          in: query
-          description: Subscriber name, an alternate way to retrieve a customer.
-          required: false
-          type: string
-        - name: subscriber-type
-          in: query
-          description: Subscriber type, a way to provide VID with only the INFRA customers.
-          required: false
-          type: string
     put:
       tags:
         - Business
@@ -17765,7 +16572,7 @@ paths:
           example: __GLOBAL-CUSTOMER-ID__
         - name: body
           in: body
-          description: customer object that needs to be created or updated. 
+          description: customer object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/customer"
@@ -17813,6 +16620,22 @@ paths:
               $ref: "#/getDefinitions/customers"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: global-customer-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: subscriber-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: subscriber-type
+          in: query
+          description:
+          required: false
+          type: string
   /business/lines-of-business/line-of-business/{line-of-business-name}/relationship-list/relationship:
     put:
       tags:
@@ -17953,7 +16776,7 @@ paths:
           example: __LINE-OF-BUSINESS-NAME__
         - name: body
           in: body
-          description: line-of-business object that needs to be created or updated. 
+          description: line-of-business object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/line-of-business"
@@ -18001,6 +16824,12 @@ paths:
               $ref: "#/getDefinitions/lines-of-business"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: line-of-business-name
+          in: query
+          description:
+          required: false
+          type: string
   /business/owning-entities/owning-entity/{owning-entity-id}/relationship-list/relationship:
     put:
       tags:
@@ -18141,7 +16970,7 @@ paths:
           example: __OWNING-ENTITY-ID__
         - name: body
           in: body
-          description: owning-entity object that needs to be created or updated. 
+          description: owning-entity object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/owning-entity"
@@ -18189,6 +17018,12 @@ paths:
               $ref: "#/getDefinitions/owning-entities"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: owning-entity-id
+          in: query
+          description:
+          required: false
+          type: string
   /business/platforms/platform/{platform-name}/relationship-list/relationship:
     put:
       tags:
@@ -18329,7 +17164,7 @@ paths:
           example: __PLATFORM-NAME__
         - name: body
           in: body
-          description: platform object that needs to be created or updated. 
+          description: platform object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/platform"
@@ -18377,6 +17212,12 @@ paths:
               $ref: "#/getDefinitions/platforms"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: platform-name
+          in: query
+          description:
+          required: false
+          type: string
   /business/projects/project/{project-name}/relationship-list/relationship:
     put:
       tags:
@@ -18517,7 +17358,7 @@ paths:
           example: __PROJECT-NAME__
         - name: body
           in: body
-          description: project object that needs to be created or updated. 
+          description: project object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/project"
@@ -18565,6 +17406,12 @@ paths:
               $ref: "#/getDefinitions/projects"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: project-name
+          in: query
+          description:
+          required: false
+          type: string
   /service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}/relationship-list/relationship:
     put:
       tags:
@@ -18639,21 +17486,6 @@ paths:
           required: true
           type: string
           example: __VNF-IMAGE-UUID__
-        - name: application
-          in: query
-          description: The application that the image instantiates.
-          required: false
-          type: string
-        - name: application-vendor
-          in: query
-          description: The vendor of the application.
-          required: false
-          type: string
-        - name: application-version
-          in: query
-          description: The version of the application.
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -18720,7 +17552,7 @@ paths:
           example: __VNF-IMAGE-UUID__
         - name: body
           in: body
-          description: vnf-image object that needs to be created or updated. 
+          description: vnf-image object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vnf-image"
@@ -18768,6 +17600,27 @@ paths:
               $ref: "#/getDefinitions/vnf-images"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: vnf-image-uuid
+          in: query
+          description:
+          required: false
+          type: string
+        - name: application
+          in: query
+          description:
+          required: false
+          type: string
+        - name: application-vendor
+          in: query
+          description:
+          required: false
+          type: string
+        - name: application-version
+          in: query
+          description:
+          required: false
+          type: string
   /service-design-and-creation/services/service/{service-id}/relationship-list/relationship:
     put:
       tags:
@@ -18842,11 +17695,6 @@ paths:
           required: true
           type: string
           example: __SERVICE-ID__
-        - name: service-description
-          in: query
-          description: Description of the service
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -18913,7 +17761,7 @@ paths:
           example: __SERVICE-ID__
         - name: body
           in: body
-          description: service object that needs to be created or updated. 
+          description: service object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/service"
@@ -18961,6 +17809,17 @@ paths:
               $ref: "#/getDefinitions/services"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: service-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: service-description
+          in: query
+          description:
+          required: false
+          type: string
   /service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}/relationship-list/relationship:
     put:
       tags:
@@ -19131,7 +17990,7 @@ paths:
           example: __VNF-TYPE__
         - name: body
           in: body
-          description: service-capability object that needs to be created or updated. 
+          description: service-capability object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/service-capability"
@@ -19185,6 +18044,17 @@ paths:
               $ref: "#/getDefinitions/service-capabilities"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: service-type
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vnf-type
+          in: query
+          description:
+          required: false
+          type: string
   /service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets/element-choice-set/{element-choice-set-uuid}/relationship-list/relationship:
     put:
       tags:
@@ -19337,26 +18207,6 @@ paths:
           required: true
           type: string
           example: __ELEMENT-CHOICE-SET-UUID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
-          in: query
-          description: Distribution Status
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -19475,7 +18325,7 @@ paths:
           example: __ELEMENT-CHOICE-SET-UUID__
         - name: body
           in: body
-          description: element-choice-set object that needs to be created or updated. 
+          description: element-choice-set object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/element-choice-set"
@@ -19577,24 +18427,9 @@ paths:
           required: true
           type: string
           example: __CONSTRAINED-ELEMENT-SET-UUID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
+        - name: element-choice-set-uuid
           in: query
-          description: Distribution Status
+          description:
           required: false
           type: string
   /service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/relationship-list/relationship:
@@ -19734,26 +18569,6 @@ paths:
           required: true
           type: string
           example: __CONSTRAINED-ELEMENT-SET-UUID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
-          in: query
-          description: Distribution Status
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -19862,7 +18677,7 @@ paths:
           example: __CONSTRAINED-ELEMENT-SET-UUID__
         - name: body
           in: body
-          description: constrained-element-set object that needs to be created or updated. 
+          description: constrained-element-set object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/constrained-element-set"
@@ -19905,73 +18720,58 @@ paths:
           type: string
           example: __MODEL-CONSTRAINT-UUID__
         - name: constrained-element-set-uuid
-          in: path
-          required: true
-          type: string
-          example: __CONSTRAINED-ELEMENT-SET-UUID__
-        - name: resource-version
+          in: path
+          required: true
+          type: string
+          example: __CONSTRAINED-ELEMENT-SET-UUID__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets:
+    get:
+      tags:
+        - ServiceDesignAndCreation
+      summary: returns constrained-element-sets
+      description: returns constrained-element-sets
+      operationId: getServiceDesignAndCreationModelsModelModelVersModelVerModelElementsModelElementModelConstraintsModelConstraintConstrainedElementSets
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/constrained-element-sets"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: model-invariant-id
+          in: path
+          description: Unique identifier corresponding to the main definition of a model in ASDC
+          required: true
+          type: string
+          example: __MODEL-INVARIANT-ID__
+        - name: model-version-id
+          in: path
+          description: Unique identifier corresponding to one version of a model in ASDC
+          required: true
+          type: string
+          example: __MODEL-VERSION-ID__
+        - name: model-element-uuid
+          in: path
+          required: true
+          type: string
+          example: __MODEL-ELEMENT-UUID__
+        - name: model-constraint-uuid
+          in: path
+          required: true
+          type: string
+          example: __MODEL-CONSTRAINT-UUID__
+        - name: constrained-element-set-uuid
           in: query
-          description: resource-version for concurrency
-          required: true
-          type: string
-  /service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets:
-    get:
-      tags:
-        - ServiceDesignAndCreation
-      summary: returns constrained-element-sets
-      description: returns constrained-element-sets
-      operationId: getServiceDesignAndCreationModelsModelModelVersModelVerModelElementsModelElementModelConstraintsModelConstraintConstrainedElementSets
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/constrained-element-sets"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: model-invariant-id
-          in: path
-          description: Unique identifier corresponding to the main definition of a model in ASDC
-          required: true
-          type: string
-          example: __MODEL-INVARIANT-ID__
-        - name: model-version-id
-          in: path
-          description: Unique identifier corresponding to one version of a model in ASDC
-          required: true
-          type: string
-          example: __MODEL-VERSION-ID__
-        - name: model-element-uuid
-          in: path
-          required: true
-          type: string
-          example: __MODEL-ELEMENT-UUID__
-        - name: model-constraint-uuid
-          in: path
-          required: true
-          type: string
-          example: __MODEL-CONSTRAINT-UUID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
-          in: query
-          description: Distribution Status
+          description:
           required: false
           type: string
   /service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}:
@@ -20014,26 +18814,6 @@ paths:
           required: true
           type: string
           example: __MODEL-CONSTRAINT-UUID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
-          in: query
-          description: Distribution Status
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -20132,7 +18912,7 @@ paths:
           example: __MODEL-CONSTRAINT-UUID__
         - name: body
           in: body
-          description: model-constraint object that needs to be created or updated. 
+          description: model-constraint object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/model-constraint"
@@ -20214,24 +18994,9 @@ paths:
           required: true
           type: string
           example: __MODEL-ELEMENT-UUID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
+        - name: model-constraint-uuid
           in: query
-          description: Distribution Status
+          description:
           required: false
           type: string
   /service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/relationship-list/relationship:
@@ -20341,26 +19106,6 @@ paths:
           required: true
           type: string
           example: __MODEL-ELEMENT-UUID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
-          in: query
-          description: Distribution Status
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -20449,7 +19194,7 @@ paths:
           example: __MODEL-ELEMENT-UUID__
         - name: body
           in: body
-          description: model-element object that needs to be created or updated. 
+          description: model-element object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/model-element"
@@ -20521,24 +19266,9 @@ paths:
           required: true
           type: string
           example: __MODEL-VERSION-ID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
+        - name: model-element-uuid
           in: query
-          description: Distribution Status
+          description:
           required: false
           type: string
   /service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata/metadatum/{metaname}:
@@ -20576,26 +19306,6 @@ paths:
           required: true
           type: string
           example: __METANAME__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
-          in: query
-          description: Distribution Status
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -20684,7 +19394,7 @@ paths:
           example: __METANAME__
         - name: body
           in: body
-          description: metadatum object that needs to be created or updated. 
+          description: metadatum object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/metadatum"
@@ -20756,24 +19466,9 @@ paths:
           required: true
           type: string
           example: __MODEL-VERSION-ID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
+        - name: metaname
           in: query
-          description: Distribution Status
+          description:
           required: false
           type: string
   /service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/relationship-list/relationship:
@@ -20868,26 +19563,6 @@ paths:
           required: true
           type: string
           example: __MODEL-VERSION-ID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
-        - name: model-name
-          in: query
-          description: Name of the model, which can change from version to version.
-          required: false
-          type: string
-        - name: model-version
-          in: query
-          description: Version
-          required: false
-          type: string
-        - name: distribution-status
-          in: query
-          description: Distribution Status
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -20966,7 +19641,7 @@ paths:
           example: __MODEL-VERSION-ID__
         - name: body
           in: body
-          description: model-ver object that needs to be created or updated. 
+          description: model-ver object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/model-ver"
@@ -21027,9 +19702,24 @@ paths:
           required: true
           type: string
           example: __MODEL-INVARIANT-ID__
-        - name: model-type
+        - name: model-version-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-version
           in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
+          description:
+          required: false
+          type: string
+        - name: distribution-status
+          in: query
+          description:
           required: false
           type: string
   /service-design-and-creation/models/model/{model-invariant-id}/relationship-list/relationship:
@@ -21106,11 +19796,6 @@ paths:
           required: true
           type: string
           example: __MODEL-INVARIANT-ID__
-        - name: model-type
-          in: query
-          description: Type of the model, e.g., service, resource, widget, etc.
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -21177,7 +19862,7 @@ paths:
           example: __MODEL-INVARIANT-ID__
         - name: body
           in: body
-          description: model object that needs to be created or updated. 
+          description: model object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/model"
@@ -21225,6 +19910,17 @@ paths:
               $ref: "#/getDefinitions/models"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: model-invariant-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-type
+          in: query
+          description:
+          required: false
+          type: string
   /service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups/related-lookup/{related-lookup-uuid}/relationship-list/relationship:
     put:
       tags:
@@ -21326,10 +20022,6 @@ paths:
           required: true
           type: string
           example: __RELATED-LOOKUP-UUID__
-        - name: named-query-name
-          in: query
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -21414,7 +20106,7 @@ paths:
           example: __RELATED-LOOKUP-UUID__
         - name: body
           in: body
-          description: related-lookup object that needs to be created or updated. 
+          description: related-lookup object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/related-lookup"
@@ -21482,8 +20174,9 @@ paths:
           required: true
           type: string
           example: __NAMED-QUERY-ELEMENT-UUID__
-        - name: named-query-name
+        - name: related-lookup-uuid
           in: query
+          description:
           required: false
           type: string
   /service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints/property-constraint/{property-constraint-uuid}:
@@ -21519,10 +20212,6 @@ paths:
           required: true
           type: string
           example: __PROPERTY-CONSTRAINT-UUID__
-        - name: named-query-name
-          in: query
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -21607,7 +20296,7 @@ paths:
           example: __PROPERTY-CONSTRAINT-UUID__
         - name: body
           in: body
-          description: property-constraint object that needs to be created or updated. 
+          description: property-constraint object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/property-constraint"
@@ -21675,8 +20364,9 @@ paths:
           required: true
           type: string
           example: __NAMED-QUERY-ELEMENT-UUID__
-        - name: named-query-name
+        - name: property-constraint-uuid
           in: query
+          description:
           required: false
           type: string
   /service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/relationship-list/relationship:
@@ -21765,10 +20455,6 @@ paths:
           required: true
           type: string
           example: __NAMED-QUERY-ELEMENT-UUID__
-        - name: named-query-name
-          in: query
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -21843,7 +20529,7 @@ paths:
           example: __NAMED-QUERY-ELEMENT-UUID__
         - name: body
           in: body
-          description: named-query-element object that needs to be created or updated. 
+          description: named-query-element object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/named-query-element"
@@ -21901,8 +20587,9 @@ paths:
           required: true
           type: string
           example: __NAMED-QUERY-UUID__
-        - name: named-query-name
+        - name: named-query-element-uuid
           in: query
+          description:
           required: false
           type: string
   /service-design-and-creation/named-queries/named-query/{named-query-uuid}/relationship-list/relationship:
@@ -21976,10 +20663,6 @@ paths:
           required: true
           type: string
           example: __NAMED-QUERY-UUID__
-        - name: named-query-name
-          in: query
-          required: false
-          type: string
     put:
       tags:
         - ServiceDesignAndCreation
@@ -22044,7 +20727,7 @@ paths:
           example: __NAMED-QUERY-UUID__
         - name: body
           in: body
-          description: named-query object that needs to be created or updated. 
+          description: named-query object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/named-query"
@@ -22091,6 +20774,17 @@ paths:
               $ref: "#/getDefinitions/named-queries"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: named-query-uuid
+          in: query
+          description:
+          required: false
+          type: string
+        - name: named-query-name
+          in: query
+          description:
+          required: false
+          type: string
   /network/logical-links/logical-link/{link-name}/relationship-list/relationship:
     put:
       tags:
@@ -22165,46 +20859,6 @@ paths:
           required: true
           type: string
           example: __LINK-NAME__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: link-id
-          in: query
-          description: UUID of the logical-link, SDNC generates this.
-          required: false
-          type: string
-        - name: circuit-id
-          in: query
-          description: Circuit id
-          required: false
-          type: string
-        - name: purpose
-          in: query
-          description: Reason for this entity, role it is playing
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -22271,7 +20925,7 @@ paths:
           example: __LINK-NAME__
         - name: body
           in: body
-          description: logical-link object that needs to be created or updated. 
+          description: logical-link object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/logical-link"
@@ -22319,6 +20973,52 @@ paths:
               $ref: "#/getDefinitions/logical-links"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: link-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-invariant-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-version-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: widget-model-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: widget-model-version
+          in: query
+          description:
+          required: false
+          type: string
+        - name: prov-status
+          in: query
+          description:
+          required: false
+          type: string
+        - name: link-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: circuit-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: purpose
+          in: query
+          description:
+          required: false
+          type: string
   /network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/classes-of-service/class-of-service/{cos}/relationship-list/relationship:
     put:
       tags:
@@ -22549,7 +21249,7 @@ paths:
           example: __COS__
         - name: body
           in: body
-          description: class-of-service object that needs to be created or updated. 
+          description: class-of-service object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/class-of-service"
@@ -22634,6 +21334,11 @@ paths:
           required: true
           type: string
           example: __SITE-PAIR-ID__
+        - name: cos
+          in: query
+          description:
+          required: false
+          type: string
   /network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/relationship-list/relationship:
     put:
       tags:
@@ -22834,7 +21539,7 @@ paths:
           example: __SITE-PAIR-ID__
         - name: body
           in: body
-          description: site-pair object that needs to be created or updated. 
+          description: site-pair object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/site-pair"
@@ -22907,6 +21612,11 @@ paths:
           required: true
           type: string
           example: __ROUTING-INSTANCE-ID__
+        - name: site-pair-id
+          in: query
+          description:
+          required: false
+          type: string
   /network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/relationship-list/relationship:
     put:
       tags:
@@ -23077,7 +21787,7 @@ paths:
           example: __ROUTING-INSTANCE-ID__
         - name: body
           in: body
-          description: routing-instance object that needs to be created or updated. 
+          description: routing-instance object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/routing-instance"
@@ -23138,6 +21848,11 @@ paths:
           required: true
           type: string
           example: __SITE-PAIR-SET-ID__
+        - name: routing-instance-id
+          in: query
+          description:
+          required: false
+          type: string
   /network/site-pair-sets/site-pair-set/{site-pair-set-id}/relationship-list/relationship:
     put:
       tags:
@@ -23278,7 +21993,7 @@ paths:
           example: __SITE-PAIR-SET-ID__
         - name: body
           in: body
-          description: site-pair-set object that needs to be created or updated. 
+          description: site-pair-set object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/site-pair-set"
@@ -23326,6 +22041,12 @@ paths:
               $ref: "#/getDefinitions/site-pair-sets"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: site-pair-set-id
+          in: query
+          description:
+          required: false
+          type: string
   /network/vpn-bindings/vpn-binding/{vpn-id}/route-targets/route-target/{global-route-target}/{route-target-role}/relationship-list/relationship:
     put:
       tags:
@@ -23436,16 +22157,6 @@ paths:
           required: true
           type: string
           example: __ROUTE-TARGET-ROLE__
-        - name: vpn-name
-          in: query
-          description: VPN Name
-          required: false
-          type: string
-        - name: vpn-type
-          in: query
-          description: Type of the vpn, should be taken from enumerated/valid values
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -23536,7 +22247,7 @@ paths:
           example: __ROUTE-TARGET-ROLE__
         - name: body
           in: body
-          description: route-target object that needs to be created or updated. 
+          description: route-target object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/route-target"
@@ -23603,16 +22314,6 @@ paths:
           required: true
           type: string
           example: __VPN-ID__
-        - name: vpn-name
-          in: query
-          description: VPN Name
-          required: false
-          type: string
-        - name: vpn-type
-          in: query
-          description: Type of the vpn, should be taken from enumerated/valid values
-          required: false
-          type: string
   /network/vpn-bindings/vpn-binding/{vpn-id}/relationship-list/relationship:
     put:
       tags:
@@ -23687,16 +22388,6 @@ paths:
           required: true
           type: string
           example: __VPN-ID__
-        - name: vpn-name
-          in: query
-          description: VPN Name
-          required: false
-          type: string
-        - name: vpn-type
-          in: query
-          description: Type of the vpn, should be taken from enumerated/valid values
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -23763,7 +22454,7 @@ paths:
           example: __VPN-ID__
         - name: body
           in: body
-          description: vpn-binding object that needs to be created or updated. 
+          description: vpn-binding object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vpn-binding"
@@ -23811,6 +22502,22 @@ paths:
               $ref: "#/getDefinitions/vpn-bindings"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: vpn-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vpn-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vpn-type
+          in: query
+          description:
+          required: false
+          type: string
   /network/vpls-pes/vpls-pe/{equipment-name}/relationship-list/relationship:
     put:
       tags:
@@ -24026,16 +22733,6 @@ paths:
           required: true
           type: string
           example: __PF-PCI-ID__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -24124,7 +22821,7 @@ paths:
           example: __PF-PCI-ID__
         - name: body
           in: body
-          description: sriov-pf object that needs to be created or updated. 
+          description: sriov-pf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-pf"
@@ -24195,14 +22892,9 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
+        - name: pf-pci-id
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
   /network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/relationship-list/relationship:
@@ -24432,58 +23124,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -24596,7 +23236,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -24793,58 +23433,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -24957,7 +23545,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -25052,42 +23640,6 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -25188,7 +23740,7 @@ paths:
           example: __VLAN-INTERFACE__
         - name: body
           in: body
-          description: vlan object that needs to be created or updated. 
+          description: vlan object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vlan"
@@ -25226,74 +23778,65 @@ paths:
           type: string
           example: __INTERFACE-NAME__
         - name: vlan-interface
-          in: path
-          description: String that identifies the interface
-          required: true
-          type: string
-          example: __VLAN-INTERFACE__
-        - name: resource-version
-          in: query
-          description: resource-version for concurrency
-          required: true
-          type: string
-  /network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans:
-    get:
-      tags:
-        - Network
-      summary: returns vlans
-      description: returns vlans
-      operationId: getNetworkVplsPesVplsPePInterfacesPInterfaceLInterfacesLInterfaceVlans
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/vlans"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: equipment-name
-          in: path
-          required: true
-          type: string
-          example: __EQUIPMENT-NAME__
-        - name: interface-name
-          in: path
-          description: Name that identifies the physical interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: interface-name
-          in: path
-          description: Name given to the interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
+          in: path
+          description: String that identifies the interface
+          required: true
+          type: string
+          example: __VLAN-INTERFACE__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans:
+    get:
+      tags:
+        - Network
+      summary: returns vlans
+      description: returns vlans
+      operationId: getNetworkVplsPesVplsPePInterfacesPInterfaceLInterfacesLInterfaceVlans
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/vlans"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: equipment-name
+          in: path
+          required: true
+          type: string
+          example: __EQUIPMENT-NAME__
+        - name: interface-name
+          in: path
+          description: Name that identifies the physical interface
+          required: true
+          type: string
+          example: __INTERFACE-NAME__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
+          type: string
+          example: __INTERFACE-NAME__
+        - name: vlan-interface
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
+        - name: vlan-id-inner
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: integer
+          format: int64
+        - name: vpn-key
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}/relationship-list/relationship:
@@ -25421,51 +23964,6 @@ paths:
           required: true
           type: string
           example: __PCI-ID__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vf-vlan-filter
-          in: query
-          description: This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.
-          required: false
-          type: string
-        - name: vf-mac-filter
-          in: query
-          description: When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.
-          required: false
-          type: string
-        - name: vf-vlan-strip
-          in: query
-          description: When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.
-          required: false
-          type: boolean
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -25566,7 +24064,7 @@ paths:
           example: __PCI-ID__
         - name: body
           in: body
-          description: sriov-vf object that needs to be created or updated. 
+          description: sriov-vf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-vf"
@@ -25649,29 +24147,29 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: prov-status
+        - name: pci-id
           in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: vf-vlan-filter
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: interface-id
+        - name: vf-mac-filter
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vf-vlan-strip
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: boolean
+        - name: neutron-network-id
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/relationship-list/relationship:
@@ -25871,47 +24369,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -26012,7 +24469,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -26185,47 +24642,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -26326,7 +24742,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -26409,31 +24825,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -26522,7 +24913,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: l-interface object that needs to be created or updated. 
+          description: l-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l-interface"
@@ -26593,14 +24984,24 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: prov-status
+        - name: interface-name
           in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: interface-id
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
+          required: false
+          type: string
+        - name: macaddr
+          in: query
+          description:
+          required: false
+          type: string
+        - name: network-name
+          in: query
+          description:
           required: false
           type: string
   /network/vpls-pes/vpls-pe/{equipment-name}/p-interfaces/p-interface/{interface-name}:
@@ -26632,16 +25033,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -26718,7 +25109,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: p-interface object that needs to be created or updated. 
+          description: p-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/p-interface"
@@ -26777,9 +25168,14 @@ paths:
           required: true
           type: string
           example: __EQUIPMENT-NAME__
+        - name: interface-name
+          in: query
+          description:
+          required: false
+          type: string
         - name: prov-status
           in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
+          description:
           required: false
           type: string
   /network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/relationship-list/relationship:
@@ -27069,63 +25465,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -27238,7 +25577,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -27435,63 +25774,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -27604,7 +25886,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -27699,47 +25981,6 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -27840,7 +26081,7 @@ paths:
           example: __VLAN-INTERFACE__
         - name: body
           in: body
-          description: vlan object that needs to be created or updated. 
+          description: vlan object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vlan"
@@ -27923,34 +26164,20 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
+        - name: vlan-interface
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vlan-id-inner
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: integer
+          format: int64
+        - name: vpn-key
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}/relationship-list/relationship:
@@ -28078,56 +26305,6 @@ paths:
           required: true
           type: string
           example: __PCI-ID__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vf-vlan-filter
-          in: query
-          description: This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.
-          required: false
-          type: string
-        - name: vf-mac-filter
-          in: query
-          description: When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.
-          required: false
-          type: string
-        - name: vf-vlan-strip
-          in: query
-          description: When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.
-          required: false
-          type: boolean
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -28228,7 +26405,7 @@ paths:
           example: __PCI-ID__
         - name: body
           in: body
-          description: sriov-vf object that needs to be created or updated. 
+          description: sriov-vf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-vf"
@@ -28311,34 +26488,29 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
+        - name: pci-id
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: interface-role
+        - name: vf-vlan-filter
           in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
+          description:
           required: false
           type: string
-        - name: interface-id
+        - name: vf-mac-filter
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vf-vlan-strip
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: boolean
+        - name: neutron-network-id
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/relationship-list/relationship:
@@ -28538,52 +26710,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -28684,7 +26810,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -28857,52 +26983,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -29003,7 +27083,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -29086,36 +27166,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -29204,7 +27254,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: l-interface object that needs to be created or updated. 
+          description: l-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l-interface"
@@ -29275,19 +27325,24 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: prov-status
+        - name: interface-name
           in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
+          description:
           required: false
           type: string
         - name: interface-id
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: interface-role
+        - name: macaddr
+          in: query
+          description:
+          required: false
+          type: string
+        - name: network-name
           in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
+          description:
           required: false
           type: string
   /network/vpls-pes/vpls-pe/{equipment-name}/lag-interfaces/lag-interface/{interface-name}:
@@ -29319,21 +27374,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -29410,7 +27450,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: lag-interface object that needs to be created or updated. 
+          description: lag-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/lag-interface"
@@ -29469,9 +27509,19 @@ paths:
           required: true
           type: string
           example: __EQUIPMENT-NAME__
-        - name: prov-status
+        - name: interface-name
           in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
+          description:
+          required: false
+          type: string
+        - name: interface-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: interface-role
+          in: query
+          description:
           required: false
           type: string
   /network/vpls-pes/vpls-pe/{equipment-name}:
@@ -29497,11 +27547,6 @@ paths:
           required: true
           type: string
           example: __EQUIPMENT-NAME__
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -29566,7 +27611,7 @@ paths:
           example: __EQUIPMENT-NAME__
         - name: body
           in: body
-          description: vpls-pe object that needs to be created or updated. 
+          description: vpls-pe object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vpls-pe"
@@ -29613,6 +27658,17 @@ paths:
               $ref: "#/getDefinitions/vpls-pes"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: equipment-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: prov-status
+          in: query
+          description:
+          required: false
+          type: string
   /network/multicast-configurations/multicast-configuration/{multicast-configuration-id}/relationship-list/relationship:
     put:
       tags:
@@ -29753,7 +27809,7 @@ paths:
           example: __MULTICAST-CONFIGURATION-ID__
         - name: body
           in: body
-          description: multicast-configuration object that needs to be created or updated. 
+          description: multicast-configuration object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/multicast-configuration"
@@ -29801,6 +27857,12 @@ paths:
               $ref: "#/getDefinitions/multicast-configurations"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: multicast-configuration-id
+          in: query
+          description:
+          required: false
+          type: string
   /network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}/cvlan-tags/cvlan-tag-entry/{cvlan-tag}/relationship-list/relationship:
     put:
       tags:
@@ -29914,61 +27976,6 @@ paths:
           type: integer
           format: int64
           example: __CVLAN-TAG__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: vpe-id
-          in: query
-          description: Unique ID of VPE connected to this VCE.
-          required: false
-          type: string
-        - name: port-group-id
-          in: query
-          description: Unique ID for port group in vmware
-          required: false
-          type: string
-        - name: switch-name
-          in: query
-          description: DVS or standard switch name (should be non-null for port groups associated with DVS)
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -30061,7 +28068,7 @@ paths:
           example: __CVLAN-TAG__
         - name: body
           in: body
-          description: cvlan-tag-entry object that needs to be created or updated. 
+          description: cvlan-tag-entry object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/cvlan-tag-entry"
@@ -30135,61 +28142,12 @@ paths:
           required: true
           type: string
           example: __INTERFACE-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: vpe-id
-          in: query
-          description: Unique ID of VPE connected to this VCE.
-          required: false
-          type: string
-        - name: port-group-id
-          in: query
-          description: Unique ID for port group in vmware
-          required: false
-          type: string
-        - name: switch-name
-          in: query
-          description: DVS or standard switch name (should be non-null for port groups associated with DVS)
-          required: false
-          type: string
-        - name: heat-stack-id
+        - name: cvlan-tag
           in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
+          description:
           required: false
-          type: string
+          type: integer
+          format: int64
   /network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}/relationship-list/relationship:
     put:
       tags:
@@ -30282,61 +28240,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: vpe-id
-          in: query
-          description: Unique ID of VPE connected to this VCE.
-          required: false
-          type: string
-        - name: port-group-id
-          in: query
-          description: Unique ID for port group in vmware
-          required: false
-          type: string
-        - name: switch-name
-          in: query
-          description: DVS or standard switch name (should be non-null for port groups associated with DVS)
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -30415,7 +28318,7 @@ paths:
           example: __INTERFACE-ID__
         - name: body
           in: body
-          description: port-group object that needs to be created or updated. 
+          description: port-group object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/port-group"
@@ -30476,44 +28379,24 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
+        - name: interface-id
           in: query
-          description: Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.
+          description:
           required: false
           type: string
-        - name: regional-resource-zone
+        - name: port-group-id
           in: query
-          description: Regional way of organizing pservers, source of truth should define values
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: switch-name
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
         - name: heat-stack-id
           in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: vpe-id
-          in: query
-          description: Unique ID of VPE connected to this VCE.
+          description:
           required: false
           type: string
   /network/vces/vce/{vnf-id}/licenses/license/{group-uuid}/{resource-uuid}/relationship-list/relationship:
@@ -30626,46 +28509,6 @@ paths:
           required: true
           type: string
           example: __RESOURCE-UUID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: vpe-id
-          in: query
-          description: Unique ID of VPE connected to this VCE.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -30756,7 +28599,7 @@ paths:
           example: __RESOURCE-UUID__
         - name: body
           in: body
-          description: license object that needs to be created or updated. 
+          description: license object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/license"
@@ -30823,44 +28666,14 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
+        - name: group-uuid
           in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
+          description:
           required: false
           type: string
-        - name: vpe-id
+        - name: resource-uuid
           in: query
-          description: Unique ID of VPE connected to this VCE.
+          description:
           required: false
           type: string
   /network/vces/vce/{vnf-id}/entitlements/entitlement/{group-uuid}/{resource-uuid}/relationship-list/relationship:
@@ -30973,46 +28786,6 @@ paths:
           required: true
           type: string
           example: __RESOURCE-UUID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: vpe-id
-          in: query
-          description: Unique ID of VPE connected to this VCE.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -31103,7 +28876,7 @@ paths:
           example: __RESOURCE-UUID__
         - name: body
           in: body
-          description: entitlement object that needs to be created or updated. 
+          description: entitlement object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/entitlement"
@@ -31170,44 +28943,14 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
+        - name: group-uuid
           in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
+          description:
           required: false
           type: string
-        - name: vpe-id
+        - name: resource-uuid
           in: query
-          description: Unique ID of VPE connected to this VCE.
+          description:
           required: false
           type: string
   /network/vces/vce/{vnf-id}/relationship-list/relationship:
@@ -31284,46 +29027,6 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: vpe-id
-          in: query
-          description: Unique ID of VPE connected to this VCE.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -31390,7 +29093,7 @@ paths:
           example: __VNF-ID__
         - name: body
           in: body
-          description: vce object that needs to be created or updated. 
+          description: vce object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vce"
@@ -31438,6 +29141,52 @@ paths:
               $ref: "#/getDefinitions/vces"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: vnf-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vnf-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vnf-name2
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vnf-type
+          in: query
+          description:
+          required: false
+          type: string
+        - name: service-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: regional-resource-zone
+          in: query
+          description:
+          required: false
+          type: string
+        - name: prov-status
+          in: query
+          description:
+          required: false
+          type: string
+        - name: heat-stack-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vpe-id
+          in: query
+          description:
+          required: false
+          type: string
   /network/vnfcs/vnfc/{vnfc-name}/relationship-list/relationship:
     put:
       tags:
@@ -31580,65 +29329,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: nfc-naming-code
-          in: query
-          description: Short code that is used in naming instances of the item being modeled
-          required: false
-          type: string
-        - name: nfc-function
-          in: query
-          description: English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: prov status of this vnfc
-          required: false
-          type: string
-        - name: ipaddress-v4-oam-vip
-          in: query
-          description: Oam V4 vip address of this vnfc
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: group-notation
-          in: query
-          description: Group notation of VNFC
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -31717,7 +29407,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -31846,65 +29536,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: nfc-naming-code
-          in: query
-          description: Short code that is used in naming instances of the item being modeled
-          required: false
-          type: string
-        - name: nfc-function
-          in: query
-          description: English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: prov status of this vnfc
-          required: false
-          type: string
-        - name: ipaddress-v4-oam-vip
-          in: query
-          description: Oam V4 vip address of this vnfc
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: group-notation
-          in: query
-          description: Group notation of VNFC
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -31983,7 +29614,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -32044,49 +29675,6 @@ paths:
           required: true
           type: string
           example: __VNFC-NAME__
-        - name: nfc-naming-code
-          in: query
-          description: Short code that is used in naming instances of the item being modeled
-          required: false
-          type: string
-        - name: nfc-function
-          in: query
-          description: English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: prov status of this vnfc
-          required: false
-          type: string
-        - name: ipaddress-v4-oam-vip
-          in: query
-          description: Oam V4 vip address of this vnfc
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: group-notation
-          in: query
-          description: Group notation of VNFC
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -32153,7 +29741,7 @@ paths:
           example: __VNFC-NAME__
         - name: body
           in: body
-          description: vnfc object that needs to be created or updated. 
+          description: vnfc object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vnfc"
@@ -32201,6 +29789,57 @@ paths:
               $ref: "#/getDefinitions/vnfcs"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: vnfc-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: nfc-naming-code
+          in: query
+          description:
+          required: false
+          type: string
+        - name: nfc-function
+          in: query
+          description:
+          required: false
+          type: string
+        - name: prov-status
+          in: query
+          description:
+          required: false
+          type: string
+        - name: ipaddress-v4-oam-vip
+          in: query
+          description:
+          required: false
+          type: string
+        - name: in-maint
+          in: query
+          description:
+          required: false
+          type: boolean
+        - name: is-closed-loop-disabled
+          in: query
+          description:
+          required: false
+          type: boolean
+        - name: group-notation
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-invariant-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-version-id
+          in: query
+          description:
+          required: false
+          type: string
   /network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id}/host-routes/host-route/{host-route-id}/relationship-list/relationship:
     put:
       tags:
@@ -32311,56 +29950,6 @@ paths:
           required: true
           type: string
           example: __HOST-ROUTE-ID__
-        - name: network-name
-          in: query
-          description: Name of the network, governed by some naming convention..
-          required: false
-          type: string
-        - name: network-role
-          in: query
-          description: Role the network plans - who defines these values?
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: contrail-network-fqdn
-          in: query
-          description: Contrail FQDN for the network
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: subnet-name
-          in: query
-          description: Name associated with the subnet.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -32451,7 +30040,7 @@ paths:
           example: __HOST-ROUTE-ID__
         - name: body
           in: body
-          description: host-route object that needs to be created or updated. 
+          description: host-route object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/host-route"
@@ -32524,54 +30113,9 @@ paths:
           required: true
           type: string
           example: __SUBNET-ID__
-        - name: network-name
-          in: query
-          description: Name of the network, governed by some naming convention..
-          required: false
-          type: string
-        - name: network-role
-          in: query
-          description: Role the network plans - who defines these values?
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: contrail-network-fqdn
-          in: query
-          description: Contrail FQDN for the network
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: subnet-name
+        - name: host-route-id
           in: query
-          description: Name associated with the subnet.
+          description:
           required: false
           type: string
   /network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id}/relationship-list/relationship:
@@ -32666,56 +30210,6 @@ paths:
           required: true
           type: string
           example: __SUBNET-ID__
-        - name: network-name
-          in: query
-          description: Name of the network, governed by some naming convention..
-          required: false
-          type: string
-        - name: network-role
-          in: query
-          description: Role the network plans - who defines these values?
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: contrail-network-fqdn
-          in: query
-          description: Contrail FQDN for the network
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: subnet-name
-          in: query
-          description: Name associated with the subnet.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -32794,7 +30288,7 @@ paths:
           example: __SUBNET-ID__
         - name: body
           in: body
-          description: subnet object that needs to be created or updated. 
+          description: subnet object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/subnet"
@@ -32855,49 +30349,14 @@ paths:
           required: true
           type: string
           example: __NETWORK-ID__
-        - name: network-name
-          in: query
-          description: Name of the network, governed by some naming convention..
-          required: false
-          type: string
-        - name: network-role
-          in: query
-          description: Role the network plans - who defines these values?
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: contrail-network-fqdn
-          in: query
-          description: Contrail FQDN for the network
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
+        - name: subnet-id
           in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
+          description:
           required: false
           type: string
-        - name: widget-model-version
+        - name: subnet-name
           in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
+          description:
           required: false
           type: string
   /network/l3-networks/l3-network/{network-id}/ctag-assignments/ctag-assignment/{vlan-id-inner}/relationship-list/relationship:
@@ -32995,51 +30454,6 @@ paths:
           type: integer
           format: int64
           example: __VLAN-ID-INNER__
-        - name: network-name
-          in: query
-          description: Name of the network, governed by some naming convention..
-          required: false
-          type: string
-        - name: network-role
-          in: query
-          description: Role the network plans - who defines these values?
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: contrail-network-fqdn
-          in: query
-          description: Contrail FQDN for the network
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -33120,7 +30534,7 @@ paths:
           example: __VLAN-ID-INNER__
         - name: body
           in: body
-          description: ctag-assignment object that needs to be created or updated. 
+          description: ctag-assignment object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/ctag-assignment"
@@ -33182,51 +30596,12 @@ paths:
           required: true
           type: string
           example: __NETWORK-ID__
-        - name: network-name
-          in: query
-          description: Name of the network, governed by some naming convention..
-          required: false
-          type: string
-        - name: network-role
-          in: query
-          description: Role the network plans - who defines these values?
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: contrail-network-fqdn
-          in: query
-          description: Contrail FQDN for the network
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
+        - name: vlan-id-inner
           in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
+          description:
           required: false
-          type: string
+          type: integer
+          format: int64
   /network/l3-networks/l3-network/{network-id}/segmentation-assignments/segmentation-assignment/{segmentation-id}/relationship-list/relationship:
     put:
       tags:
@@ -33319,51 +30694,6 @@ paths:
           required: true
           type: string
           example: __SEGMENTATION-ID__
-        - name: network-name
-          in: query
-          description: Name of the network, governed by some naming convention..
-          required: false
-          type: string
-        - name: network-role
-          in: query
-          description: Role the network plans - who defines these values?
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: contrail-network-fqdn
-          in: query
-          description: Contrail FQDN for the network
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -33442,7 +30772,7 @@ paths:
           example: __SEGMENTATION-ID__
         - name: body
           in: body
-          description: segmentation-assignment object that needs to be created or updated. 
+          description: segmentation-assignment object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/segmentation-assignment"
@@ -33503,49 +30833,9 @@ paths:
           required: true
           type: string
           example: __NETWORK-ID__
-        - name: network-name
-          in: query
-          description: Name of the network, governed by some naming convention..
-          required: false
-          type: string
-        - name: network-role
-          in: query
-          description: Role the network plans - who defines these values?
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: contrail-network-fqdn
-          in: query
-          description: Contrail FQDN for the network
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
+        - name: segmentation-id
           in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
+          description:
           required: false
           type: string
   /network/l3-networks/l3-network/{network-id}/relationship-list/relationship:
@@ -33622,51 +30912,6 @@ paths:
           required: true
           type: string
           example: __NETWORK-ID__
-        - name: network-name
-          in: query
-          description: Name of the network, governed by some naming convention..
-          required: false
-          type: string
-        - name: network-role
-          in: query
-          description: Role the network plans - who defines these values?
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: contrail-network-fqdn
-          in: query
-          description: Contrail FQDN for the network
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -33733,7 +30978,7 @@ paths:
           example: __NETWORK-ID__
         - name: body
           in: body
-          description: l3-network object that needs to be created or updated. 
+          description: l3-network object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-network"
@@ -33781,6 +31026,57 @@ paths:
               $ref: "#/getDefinitions/l3-networks"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: network-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: network-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: network-role
+          in: query
+          description:
+          required: false
+          type: string
+        - name: service-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: heat-stack-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: contrail-network-fqdn
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-invariant-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-version-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: widget-model-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: widget-model-version
+          in: query
+          description:
+          required: false
+          type: string
   /network/network-policies/network-policy/{network-policy-id}/relationship-list/relationship:
     put:
       tags:
@@ -33855,11 +31151,6 @@ paths:
           required: true
           type: string
           example: __NETWORK-POLICY-ID__
-        - name: network-policy-fqdn
-          in: query
-          description: Contrail FQDN for the policy
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -33926,7 +31217,7 @@ paths:
           example: __NETWORK-POLICY-ID__
         - name: body
           in: body
-          description: network-policy object that needs to be created or updated. 
+          description: network-policy object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/network-policy"
@@ -33974,6 +31265,17 @@ paths:
               $ref: "#/getDefinitions/network-policies"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: network-policy-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: network-policy-fqdn
+          in: query
+          description:
+          required: false
+          type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}/relationship-list/relationship:
     put:
       tags:
@@ -34226,131 +31528,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -34453,7 +31630,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -34630,131 +31807,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -34857,7 +31909,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -34942,115 +31994,6 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -35141,7 +32084,7 @@ paths:
           example: __VLAN-INTERFACE__
         - name: body
           in: body
-          description: vlan object that needs to be created or updated. 
+          description: vlan object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vlan"
@@ -35214,102 +32157,20 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
+        - name: vlan-interface
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vlan-id-inner
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: integer
+          format: int64
+        - name: vpn-key
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}/relationship-list/relationship:
@@ -35422,124 +32283,6 @@ paths:
           required: true
           type: string
           example: __PCI-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vf-vlan-filter
-          in: query
-          description: This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.
-          required: false
-          type: string
-        - name: vf-mac-filter
-          in: query
-          description: When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.
-          required: false
-          type: string
-        - name: vf-vlan-strip
-          in: query
-          description: When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.
-          required: false
-          type: boolean
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -35630,7 +32373,7 @@ paths:
           example: __PCI-ID__
         - name: body
           in: body
-          description: sriov-vf object that needs to be created or updated. 
+          description: sriov-vf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-vf"
@@ -35703,102 +32446,29 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
+        - name: pci-id
           in: query
-          description: Regional way of organizing pservers, source of truth should define values
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: vf-vlan-filter
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: heat-stack-id
+        - name: vf-mac-filter
           in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
+          description:
           required: false
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
+        - name: vf-vlan-strip
           in: query
+          description:
           required: false
           type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
+        - name: neutron-network-id
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/relationship-list/relationship:
@@ -35973,120 +32643,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -36177,7 +32733,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -36330,120 +32886,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -36534,7 +32976,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -36607,104 +33049,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -36783,7 +33127,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: l-interface object that needs to be created or updated. 
+          description: l-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l-interface"
@@ -36844,87 +33188,24 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
+        - name: interface-name
           in: query
-          description: Generic description of the type of NF
+          description:
           required: false
           type: string
-        - name: nf-function
+        - name: interface-id
           in: query
-          description: English description of Network function that the specific VNF deployment is providing
+          description:
           required: false
           type: string
-        - name: nf-role
+        - name: macaddr
           in: query
-          description: role in the network that this model will be providing
+          description:
           required: false
           type: string
-        - name: nf-naming-code
+        - name: network-name
           in: query
-          description: string assigned to this model used for naming purposes
+          description:
           required: false
           type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/relationship-list/relationship:
@@ -37221,141 +33502,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -37470,7 +33616,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -37647,165 +33793,30 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: interface-name
-          in: path
-          description: Name that identifies the link aggregate interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: interface-name
-          in: path
-          description: Name given to the interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: vlan-interface
-          in: path
-          description: String that identifies the interface
-          required: true
-          type: string
-          example: __VLAN-INTERFACE__
-        - name: l3-interface-ipv6-address
-          in: path
-          description: IP address
-          required: true
-          type: string
-          example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
+        - name: interface-name
+          in: path
+          description: Name that identifies the link aggregate interface
+          required: true
           type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
+          example: __INTERFACE-NAME__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
           type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
+          example: __INTERFACE-NAME__
+        - name: vlan-interface
+          in: path
+          description: String that identifies the interface
+          required: true
           type: string
+          example: __VLAN-INTERFACE__
+        - name: l3-interface-ipv6-address
+          in: path
+          description: IP address
+          required: true
+          type: string
+          example: __L3-INTERFACE-IPV6-ADDRESS__
     put:
       tags:
         - Network
@@ -37920,7 +33931,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -38017,125 +34028,6 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -38238,7 +34130,7 @@ paths:
           example: __VLAN-INTERFACE__
         - name: body
           in: body
-          description: vlan object that needs to be created or updated. 
+          description: vlan object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vlan"
@@ -38323,112 +34215,20 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
+        - name: vlan-interface
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vlan-id-inner
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: integer
+          format: int64
+        - name: vpn-key
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}/relationship-list/relationship:
@@ -38559,134 +34359,6 @@ paths:
           required: true
           type: string
           example: __PCI-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vf-vlan-filter
-          in: query
-          description: This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.
-          required: false
-          type: string
-        - name: vf-mac-filter
-          in: query
-          description: When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.
-          required: false
-          type: string
-        - name: vf-vlan-strip
-          in: query
-          description: When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.
-          required: false
-          type: boolean
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -38789,7 +34461,7 @@ paths:
           example: __PCI-ID__
         - name: body
           in: body
-          description: sriov-vf object that needs to be created or updated. 
+          description: sriov-vf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-vf"
@@ -38874,112 +34546,29 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
+        - name: pci-id
           in: query
-          description: Regional way of organizing pservers, source of truth should define values
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: vf-vlan-filter
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: heat-stack-id
+        - name: vf-mac-filter
           in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
+          description:
           required: false
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
+        - name: vf-vlan-strip
           in: query
+          description:
           required: false
           type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
+        - name: neutron-network-id
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/relationship-list/relationship:
@@ -39168,146 +34757,22 @@ paths:
           example: __VNF-ID__
         - name: interface-name
           in: path
-          description: Name that identifies the link aggregate interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: interface-name
-          in: path
-          description: Name given to the interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: l3-interface-ipv4-address
-          in: path
-          description: IP address
-          required: true
-          type: string
-          example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
+          description: Name that identifies the link aggregate interface
+          required: true
           type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
+          example: __INTERFACE-NAME__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
+          type: string
+          example: __INTERFACE-NAME__
+        - name: l3-interface-ipv4-address
+          in: path
+          description: IP address
+          required: true
           type: string
+          example: __L3-INTERFACE-IPV4-ADDRESS__
     put:
       tags:
         - Network
@@ -39410,7 +34875,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -39587,130 +35052,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -39813,7 +35154,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -39898,114 +35239,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -40096,7 +35329,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: l-interface object that needs to be created or updated. 
+          description: l-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l-interface"
@@ -40169,97 +35402,24 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
+        - name: interface-name
           in: query
-          description: role in the network that this model will be providing
+          description:
           required: false
           type: string
-        - name: nf-naming-code
+        - name: interface-id
           in: query
-          description: string assigned to this model used for naming purposes
+          description:
           required: false
           type: string
-        - name: interface-id
+        - name: macaddr
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: interface-role
+        - name: network-name
           in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
+          description:
           required: false
           type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}:
@@ -40292,99 +35452,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -40463,7 +35530,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: lag-interface object that needs to be created or updated. 
+          description: lag-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/lag-interface"
@@ -40524,87 +35591,19 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
+        - name: interface-name
           in: query
-          description: English description of Network function that the specific VNF deployment is providing
+          description:
           required: false
           type: string
-        - name: nf-role
+        - name: interface-id
           in: query
-          description: role in the network that this model will be providing
+          description:
           required: false
           type: string
-        - name: nf-naming-code
+        - name: interface-role
           in: query
-          description: string assigned to this model used for naming purposes
+          description:
           required: false
           type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id}/relationship-list/relationship:
@@ -40699,124 +35698,6 @@ paths:
           required: true
           type: string
           example: __VF-MODULE-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
-        - name: vf-module-name
-          in: query
-          description: Name of vf-module
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance.
-          required: false
-          type: string
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: contrail-service-instance-fqdn
-          in: query
-          description: the Contrail unique ID for a service-instance
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -40895,7 +35776,7 @@ paths:
           example: __VF-MODULE-ID__
         - name: body
           in: body
-          description: vf-module object that needs to be created or updated. 
+          description: vf-module object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vf-module"
@@ -40956,87 +35837,44 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
+        - name: vf-module-id
           in: query
-          description: Regional way of organizing pservers, source of truth should define values
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: vf-module-name
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
         - name: heat-stack-id
           in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
+          description:
           required: false
           type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
         - name: model-invariant-id
           in: query
-          description: the ASDC model id for this resource or service model.
+          description:
           required: false
           type: string
         - name: model-version-id
           in: query
-          description: the ASDC model version for this resource or service model.
+          description:
           required: false
           type: string
         - name: widget-model-id
           in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
+          description:
           required: false
           type: string
         - name: widget-model-version
           in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
+          description:
           required: false
           type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
+        - name: contrail-service-instance-fqdn
           in: query
-          description: string assigned to this model used for naming purposes
+          description:
           required: false
           type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}/licenses/license/{group-uuid}/{resource-uuid}/relationship-list/relationship:
@@ -41149,89 +35987,6 @@ paths:
           required: true
           type: string
           example: __RESOURCE-UUID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -41322,7 +36077,7 @@ paths:
           example: __RESOURCE-UUID__
         - name: body
           in: body
-          description: license object that needs to be created or updated. 
+          description: license object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/license"
@@ -41389,87 +36144,14 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
+        - name: group-uuid
           in: query
-          description: role in the network that this model will be providing
+          description:
           required: false
           type: string
-        - name: nf-naming-code
+        - name: resource-uuid
           in: query
-          description: string assigned to this model used for naming purposes
+          description:
           required: false
           type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}/entitlements/entitlement/{group-uuid}/{resource-uuid}/relationship-list/relationship:
@@ -41582,89 +36264,6 @@ paths:
           required: true
           type: string
           example: __RESOURCE-UUID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -41755,7 +36354,7 @@ paths:
           example: __RESOURCE-UUID__
         - name: body
           in: body
-          description: entitlement object that needs to be created or updated. 
+          description: entitlement object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/entitlement"
@@ -41822,87 +36421,14 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
+        - name: group-uuid
           in: query
-          description: role in the network that this model will be providing
+          description:
           required: false
           type: string
-        - name: nf-naming-code
+        - name: resource-uuid
           in: query
-          description: string assigned to this model used for naming purposes
+          description:
           required: false
           type: string
   /network/generic-vnfs/generic-vnf/{vnf-id}:
@@ -41929,89 +36455,6 @@ paths:
           required: true
           type: string
           example: __VNF-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: service-id
-          in: query
-          description: Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED
-          required: false
-          type: string
-        - name: regional-resource-zone
-          in: query
-          description: Regional way of organizing pservers, source of truth should define values
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: in-maint
-          in: query
-          required: false
-          type: boolean
-        - name: is-closed-loop-disabled
-          in: query
-          required: false
-          type: boolean
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
-        - name: widget-model-id
-          in: query
-          description: the ASDC data dictionary widget model. This maps directly to the A&AI widget.
-          required: false
-          type: string
-        - name: widget-model-version
-          in: query
-          description: the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.
-          required: false
-          type: string
-        - name: nf-type
-          in: query
-          description: Generic description of the type of NF
-          required: false
-          type: string
-        - name: nf-function
-          in: query
-          description: English description of Network function that the specific VNF deployment is providing
-          required: false
-          type: string
-        - name: nf-role
-          in: query
-          description: role in the network that this model will be providing
-          required: false
-          type: string
-        - name: nf-naming-code
-          in: query
-          description: string assigned to this model used for naming purposes
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -42078,7 +36521,7 @@ paths:
           example: __VNF-ID__
         - name: body
           in: body
-          description: generic-vnf object that needs to be created or updated. 
+          description: generic-vnf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/generic-vnf"
@@ -42126,6 +36569,97 @@ paths:
               $ref: "#/getDefinitions/generic-vnfs"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: vnf-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vnf-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vnf-name2
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vnf-type
+          in: query
+          description:
+          required: false
+          type: string
+        - name: service-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: regional-resource-zone
+          in: query
+          description:
+          required: false
+          type: string
+        - name: prov-status
+          in: query
+          description:
+          required: false
+          type: string
+        - name: heat-stack-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: in-maint
+          in: query
+          description:
+          required: false
+          type: boolean
+        - name: is-closed-loop-disabled
+          in: query
+          description:
+          required: false
+          type: boolean
+        - name: model-invariant-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-version-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: widget-model-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: widget-model-version
+          in: query
+          description:
+          required: false
+          type: string
+        - name: nf-type
+          in: query
+          description:
+          required: false
+          type: string
+        - name: nf-function
+          in: query
+          description:
+          required: false
+          type: string
+        - name: nf-role
+          in: query
+          description:
+          required: false
+          type: string
+        - name: nf-naming-code
+          in: query
+          description:
+          required: false
+          type: string
   /network/lag-links/lag-link/{link-name}/relationship-list/relationship:
     put:
       tags:
@@ -42266,7 +36800,7 @@ paths:
           example: __LINK-NAME__
         - name: body
           in: body
-          description: lag-link object that needs to be created or updated. 
+          description: lag-link object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/lag-link"
@@ -42314,6 +36848,12 @@ paths:
               $ref: "#/getDefinitions/lag-links"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: link-name
+          in: query
+          description:
+          required: false
+          type: string
   /network/newvces/newvce/{vnf-id2}/relationship-list/relationship:
     put:
       tags:
@@ -42566,73 +37106,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -42735,7 +37208,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -42912,73 +37385,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -43081,7 +37487,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -43166,57 +37572,6 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -43307,7 +37662,7 @@ paths:
           example: __VLAN-INTERFACE__
         - name: body
           in: body
-          description: vlan object that needs to be created or updated. 
+          description: vlan object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vlan"
@@ -43380,44 +37735,20 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: interface-id
+        - name: vlan-interface
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vlan-id-inner
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: integer
+          format: int64
+        - name: vpn-key
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}/relationship-list/relationship:
@@ -43454,142 +37785,82 @@ paths:
           required: true
           type: string
           example: __PCI-ID__
-        - name: body
-          in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/NetworkNewvcesNewvceLInterfacesLInterfaceSriovVfsSriovVf.json)
-          required: true
-          schema:
-            $ref: "#/definitions/relationship"
-    delete:
-      tags:
-        - Network
-      summary: delete an existing relationship
-      description: delete an existing relationship
-      operationId: deleteNetworkNewvcesNewvceLInterfacesLInterfaceSriovVfsSriovVfRelationshipListRelationship
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: vnf-id2
-          in: path
-          description: Unique id of VNF, can't use same attribute name right now until we promote this new object
-          required: true
-          type: string
-          example: __VNF-ID2__
-        - name: interface-name
-          in: path
-          description: Name given to the interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: pci-id
-          in: path
-          description: PCI ID used to identify the sriov-vf
-          required: true
-          type: string
-          example: __PCI-ID__
-  /network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}:
-    get:
-      tags:
-        - Network
-      summary: returns sriov-vf
-      description: returns sriov-vf
-      operationId: getNetworkNewvcesNewvceLInterfacesLInterfaceSriovVfsSriovVf
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/sriov-vf"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: vnf-id2
-          in: path
-          description: Unique id of VNF, can't use same attribute name right now until we promote this new object
-          required: true
-          type: string
-          example: __VNF-ID2__
-        - name: interface-name
-          in: path
-          description: Name given to the interface
-          required: true
-          type: string
-          example: __INTERFACE-NAME__
-        - name: pci-id
-          in: path
-          description: PCI ID used to identify the sriov-vf
-          required: true
-          type: string
-          example: __PCI-ID__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
+        - name: body
+          in: body
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/NetworkNewvcesNewvceLInterfacesLInterfaceSriovVfsSriovVf.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - Network
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteNetworkNewvcesNewvceLInterfacesLInterfaceSriovVfsSriovVfRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: vnf-id2
+          in: path
+          description: Unique id of VNF, can't use same attribute name right now until we promote this new object
+          required: true
           type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
+          example: __VNF-ID2__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
           type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
+          example: __INTERFACE-NAME__
+        - name: pci-id
+          in: path
+          description: PCI ID used to identify the sriov-vf
+          required: true
           type: string
-        - name: vf-vlan-filter
-          in: query
-          description: This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.
-          required: false
+          example: __PCI-ID__
+  /network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}:
+    get:
+      tags:
+        - Network
+      summary: returns sriov-vf
+      description: returns sriov-vf
+      operationId: getNetworkNewvcesNewvceLInterfacesLInterfaceSriovVfsSriovVf
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/sriov-vf"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: vnf-id2
+          in: path
+          description: Unique id of VNF, can't use same attribute name right now until we promote this new object
+          required: true
           type: string
-        - name: vf-mac-filter
-          in: query
-          description: When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.
-          required: false
+          example: __VNF-ID2__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
           type: string
-        - name: vf-vlan-strip
-          in: query
-          description: When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.
-          required: false
-          type: boolean
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface
-          required: false
+          example: __INTERFACE-NAME__
+        - name: pci-id
+          in: path
+          description: PCI ID used to identify the sriov-vf
+          required: true
           type: string
+          example: __PCI-ID__
     put:
       tags:
         - Network
@@ -43680,7 +37951,7 @@ paths:
           example: __PCI-ID__
         - name: body
           in: body
-          description: sriov-vf object that needs to be created or updated. 
+          description: sriov-vf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-vf"
@@ -43753,44 +38024,29 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: prov-status
+        - name: pci-id
           in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: heat-stack-id
+        - name: vf-vlan-filter
           in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
+          description:
           required: false
           type: string
-        - name: interface-id
+        - name: vf-mac-filter
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vf-vlan-strip
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: boolean
+        - name: neutron-network-id
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/relationship-list/relationship:
@@ -43965,62 +38221,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -44111,7 +38311,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -44264,62 +38464,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -44410,7 +38554,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -44483,46 +38627,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -44601,7 +38705,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: l-interface object that needs to be created or updated. 
+          description: l-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l-interface"
@@ -44662,29 +38766,24 @@ paths:
           required: true
           type: string
           example: __VNF-ID2__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
+        - name: interface-name
           in: query
-          description: Alternate name of VNF.
+          description:
           required: false
           type: string
-        - name: vnf-type
+        - name: interface-id
           in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: macaddr
           in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: heat-stack-id
+        - name: network-name
           in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
+          description:
           required: false
           type: string
   /network/newvces/newvce/{vnf-id2}:
@@ -44711,31 +38810,6 @@ paths:
           required: true
           type: string
           example: __VNF-ID2__
-        - name: vnf-name
-          in: query
-          description: Name of VNF.
-          required: false
-          type: string
-        - name: vnf-name2
-          in: query
-          description: Alternate name of VNF.
-          required: false
-          type: string
-        - name: vnf-type
-          in: query
-          description: String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this VNF by BAU Service Assurance systems.
-          required: false
-          type: string
-        - name: heat-stack-id
-          in: query
-          description: Heat stack id corresponding to this instance, managed by MSO
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -44802,7 +38876,7 @@ paths:
           example: __VNF-ID2__
         - name: body
           in: body
-          description: newvce object that needs to be created or updated. 
+          description: newvce object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/newvce"
@@ -44850,6 +38924,37 @@ paths:
               $ref: "#/getDefinitions/newvces"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: vnf-id2
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vnf-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vnf-name2
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vnf-type
+          in: query
+          description:
+          required: false
+          type: string
+        - name: prov-status
+          in: query
+          description:
+          required: false
+          type: string
+        - name: heat-stack-id
+          in: query
+          description:
+          required: false
+          type: string
   /network/pnfs/pnf/{pnf-name}/relationship-list/relationship:
     put:
       tags:
@@ -45072,16 +39177,6 @@ paths:
           required: true
           type: string
           example: __PF-PCI-ID__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -45172,7 +39267,7 @@ paths:
           example: __PF-PCI-ID__
         - name: body
           in: body
-          description: sriov-pf object that needs to be created or updated. 
+          description: sriov-pf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-pf"
@@ -45245,14 +39340,9 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
+        - name: pf-pci-id
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
   /network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/relationship-list/relationship:
@@ -45487,58 +39577,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -45653,7 +39691,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -45854,58 +39892,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -46020,7 +40006,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -46117,42 +40103,6 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -46255,7 +40205,7 @@ paths:
           example: __VLAN-INTERFACE__
         - name: body
           in: body
-          description: vlan object that needs to be created or updated. 
+          description: vlan object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vlan"
@@ -46340,29 +40290,20 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
+        - name: vlan-interface
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vlan-id-inner
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: integer
+          format: int64
+        - name: vpn-key
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}/relationship-list/relationship:
@@ -46493,51 +40434,6 @@ paths:
           required: true
           type: string
           example: __PCI-ID__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vf-vlan-filter
-          in: query
-          description: This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.
-          required: false
-          type: string
-        - name: vf-mac-filter
-          in: query
-          description: When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.
-          required: false
-          type: string
-        - name: vf-vlan-strip
-          in: query
-          description: When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.
-          required: false
-          type: boolean
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -46640,7 +40536,7 @@ paths:
           example: __PCI-ID__
         - name: body
           in: body
-          description: sriov-vf object that needs to be created or updated. 
+          description: sriov-vf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-vf"
@@ -46725,29 +40621,29 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
+        - name: pci-id
           in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: vf-vlan-filter
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
-        - name: interface-id
+        - name: vf-mac-filter
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vf-vlan-strip
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: boolean
+        - name: neutron-network-id
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/relationship-list/relationship:
@@ -46952,47 +40848,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -47095,7 +40950,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -47272,47 +41127,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -47415,7 +41229,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -47500,31 +41314,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -47615,7 +41404,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: l-interface object that needs to be created or updated. 
+          description: l-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l-interface"
@@ -47688,14 +41477,24 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
+        - name: interface-name
           in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
+          description:
           required: false
           type: string
-        - name: prov-status
+        - name: interface-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: macaddr
+          in: query
+          description:
+          required: false
+          type: string
+        - name: network-name
           in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+          description:
           required: false
           type: string
   /network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}:
@@ -47728,16 +41527,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: prov-status
-          in: query
-          description: Trigger for operational monitoring of this resource by Service Assurance systems.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -47816,7 +41605,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: p-interface object that needs to be created or updated. 
+          description: p-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/p-interface"
@@ -47877,9 +41666,14 @@ paths:
           required: true
           type: string
           example: __PNF-NAME__
-        - name: inv-status
+        - name: interface-name
           in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
+          description:
+          required: false
+          type: string
+        - name: prov-status
+          in: query
+          description:
           required: false
           type: string
   /network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/relationship-list/relationship:
@@ -48176,63 +41970,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -48347,7 +42084,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -48548,63 +42285,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -48719,7 +42399,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -48816,47 +42496,6 @@ paths:
           required: true
           type: string
           example: __VLAN-INTERFACE__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: vpn-key
-          in: query
-          description: This indicates the customers VPN ID associated with this vlan
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -48959,7 +42598,7 @@ paths:
           example: __VLAN-INTERFACE__
         - name: body
           in: body
-          description: vlan object that needs to be created or updated. 
+          description: vlan object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vlan"
@@ -49044,34 +42683,20 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
+        - name: vlan-interface
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vlan-id-inner
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: integer
+          format: int64
+        - name: vpn-key
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/sriov-vfs/sriov-vf/{pci-id}/relationship-list/relationship:
@@ -49202,56 +42827,6 @@ paths:
           required: true
           type: string
           example: __PCI-ID__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vf-vlan-filter
-          in: query
-          description: This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.
-          required: false
-          type: string
-        - name: vf-mac-filter
-          in: query
-          description: When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.
-          required: false
-          type: string
-        - name: vf-vlan-strip
-          in: query
-          description: When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.
-          required: false
-          type: boolean
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -49354,7 +42929,7 @@ paths:
           example: __PCI-ID__
         - name: body
           in: body
-          description: sriov-vf object that needs to be created or updated. 
+          description: sriov-vf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/sriov-vf"
@@ -49439,34 +43014,29 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: interface-id
+        - name: pci-id
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: interface-role
+        - name: vf-vlan-filter
           in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
+          description:
           required: false
           type: string
-        - name: interface-id
+        - name: vf-mac-filter
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: macaddr
+        - name: vf-vlan-strip
           in: query
-          description: MAC address for the interface
+          description:
           required: false
-          type: string
-        - name: network-name
+          type: boolean
+        - name: neutron-network-id
           in: query
-          description: Name of the network
+          description:
           required: false
           type: string
   /network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/relationship-list/relationship:
@@ -49671,52 +43241,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV4-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -49819,7 +43343,7 @@ paths:
           example: __L3-INTERFACE-IPV4-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv4-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv4-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv4-address-list"
@@ -49996,52 +43520,6 @@ paths:
           required: true
           type: string
           example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
-        - name: vlan-id-inner
-          in: query
-          description: Inner VLAN tag
-          required: false
-          type: integer
-          format: int64
-        - name: neutron-network-id
-          in: query
-          description: Neutron network id of the interface that address belongs to
-          required: false
-          type: string
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -50144,7 +43622,7 @@ paths:
           example: __L3-INTERFACE-IPV6-ADDRESS__
         - name: body
           in: body
-          description: l3-interface-ipv6-address-list object that needs to be created or updated. 
+          description: l3-interface-ipv6-address-list object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l3-interface-ipv6-address-list"
@@ -50229,36 +43707,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
-          type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -50349,7 +43797,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: l-interface object that needs to be created or updated. 
+          description: l-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/l-interface"
@@ -50422,19 +43870,24 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
+        - name: interface-name
           in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
+          description:
           required: false
           type: string
         - name: interface-id
           in: query
-          description: ID of interface
+          description:
           required: false
           type: string
-        - name: interface-role
+        - name: macaddr
           in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
+          description:
+          required: false
+          type: string
+        - name: network-name
+          in: query
+          description:
           required: false
           type: string
   /network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}:
@@ -50467,21 +43920,6 @@ paths:
           required: true
           type: string
           example: __INTERFACE-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
-          type: string
-        - name: interface-role
-          in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -50560,7 +43998,7 @@ paths:
           example: __INTERFACE-NAME__
         - name: body
           in: body
-          description: lag-interface object that needs to be created or updated. 
+          description: lag-interface object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/lag-interface"
@@ -50621,9 +44059,19 @@ paths:
           required: true
           type: string
           example: __PNF-NAME__
-        - name: inv-status
+        - name: interface-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: interface-id
           in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
+          description:
+          required: false
+          type: string
+        - name: interface-role
+          in: query
+          description:
           required: false
           type: string
   /network/pnfs/pnf/{pnf-name}:
@@ -50650,11 +44098,6 @@ paths:
           required: true
           type: string
           example: __PNF-NAME__
-        - name: inv-status
-          in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -50721,7 +44164,7 @@ paths:
           example: __PNF-NAME__
         - name: body
           in: body
-          description: pnf object that needs to be created or updated. 
+          description: pnf object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/pnf"
@@ -50769,6 +44212,17 @@ paths:
               $ref: "#/getDefinitions/pnfs"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: pnf-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: inv-status
+          in: query
+          description:
+          required: false
+          type: string
   /network/physical-links/physical-link/{link-name}/relationship-list/relationship:
     put:
       tags:
@@ -50843,11 +44297,6 @@ paths:
           required: true
           type: string
           example: __LINK-NAME__
-        - name: circuit-id
-          in: query
-          description: Circuit it
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -50914,7 +44363,7 @@ paths:
           example: __LINK-NAME__
         - name: body
           in: body
-          description: physical-link object that needs to be created or updated. 
+          description: physical-link object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/physical-link"
@@ -50962,6 +44411,17 @@ paths:
               $ref: "#/getDefinitions/physical-links"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: link-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: circuit-id
+          in: query
+          description:
+          required: false
+          type: string
   /network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/relationship-list/relationship:
     put:
       tags:
@@ -51182,7 +44642,7 @@ paths:
           example: __VIG-ADDRESS-TYPE__
         - name: body
           in: body
-          description: vig-server object that needs to be created or updated. 
+          description: vig-server object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/vig-server"
@@ -51243,6 +44703,11 @@ paths:
           required: true
           type: string
           example: __IPSEC-CONFIGURATION-ID__
+        - name: vig-address-type
+          in: query
+          description:
+          required: false
+          type: string
   /network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}:
     get:
       tags:
@@ -51333,7 +44798,7 @@ paths:
           example: __IPSEC-CONFIGURATION-ID__
         - name: body
           in: body
-          description: ipsec-configuration object that needs to be created or updated. 
+          description: ipsec-configuration object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/ipsec-configuration"
@@ -51381,6 +44846,12 @@ paths:
               $ref: "#/getDefinitions/ipsec-configurations"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: ipsec-configuration-id
+          in: query
+          description:
+          required: false
+          type: string
   /network/route-table-references/route-table-reference/{route-table-reference-id}/relationship-list/relationship:
     put:
       tags:
@@ -51455,11 +44926,6 @@ paths:
           required: true
           type: string
           example: __ROUTE-TABLE-REFERENCE-ID__
-        - name: route-table-reference-fqdn
-          in: query
-          description: FQDN entry in the route table.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -51526,7 +44992,7 @@ paths:
           example: __ROUTE-TABLE-REFERENCE-ID__
         - name: body
           in: body
-          description: route-table-reference object that needs to be created or updated. 
+          description: route-table-reference object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/route-table-reference"
@@ -51574,6 +45040,17 @@ paths:
               $ref: "#/getDefinitions/route-table-references"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: route-table-reference-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: route-table-reference-fqdn
+          in: query
+          description:
+          required: false
+          type: string
   /network/instance-groups/instance-group/{id}/relationship-list/relationship:
     put:
       tags:
@@ -51648,21 +45125,6 @@ paths:
           required: true
           type: string
           example: __ID__
-        - name: description
-          in: query
-          description: Descriptive text to help identify the usage of this instance-group
-          required: false
-          type: string
-        - name: type
-          in: query
-          description: Only valid value today is lower case ha for high availability
-          required: false
-          type: string
-        - name: sub-type
-          in: query
-          description: Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -51729,7 +45191,7 @@ paths:
           example: __ID__
         - name: body
           in: body
-          description: instance-group object that needs to be created or updated. 
+          description: instance-group object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/instance-group"
@@ -51777,6 +45239,27 @@ paths:
               $ref: "#/getDefinitions/instance-groups"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: description
+          in: query
+          description:
+          required: false
+          type: string
+        - name: type
+          in: query
+          description:
+          required: false
+          type: string
+        - name: sub-type
+          in: query
+          description:
+          required: false
+          type: string
   /network/zones/zone/{zone-id}/relationship-list/relationship:
     put:
       tags:
@@ -51851,16 +45334,6 @@ paths:
           required: true
           type: string
           example: __ZONE-ID__
-        - name: design-type
-          in: query
-          description: Design of zone [Medium/Large…]
-          required: false
-          type: string
-        - name: zone-context
-          in: query
-          description: Context of zone [production/test]
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -51927,7 +45400,7 @@ paths:
           example: __ZONE-ID__
         - name: body
           in: body
-          description: zone object that needs to be created or updated. 
+          description: zone object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/zone"
@@ -51975,6 +45448,22 @@ paths:
               $ref: "#/getDefinitions/zones"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: zone-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: design-type
+          in: query
+          description:
+          required: false
+          type: string
+        - name: zone-context
+          in: query
+          description:
+          required: false
+          type: string
   /network/configurations/configuration/{configuration-id}/relationship-list/relationship:
     put:
       tags:
@@ -52054,16 +45543,6 @@ paths:
           required: true
           type: string
           example: __METANAME__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -52140,7 +45619,7 @@ paths:
           example: __METANAME__
         - name: body
           in: body
-          description: metadatum object that needs to be created or updated. 
+          description: metadatum object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/metadatum"
@@ -52200,14 +45679,9 @@ paths:
           required: true
           type: string
           example: __CONFIGURATION-ID__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
+        - name: metaname
           in: query
-          description: the ASDC model version for this resource or service model.
+          description:
           required: false
           type: string
   /network/configurations/configuration/{configuration-id}/forwarder-evcs/forwarder-evc/{forwarder-evc-id}/relationship-list/relationship:
@@ -52302,16 +45776,6 @@ paths:
           required: true
           type: string
           example: __FORWARDER-EVC-ID__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -52390,7 +45854,7 @@ paths:
           example: __FORWARDER-EVC-ID__
         - name: body
           in: body
-          description: forwarder-evc object that needs to be created or updated. 
+          description: forwarder-evc object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/forwarder-evc"
@@ -52451,16 +45915,6 @@ paths:
           required: true
           type: string
           example: __CONFIGURATION-ID__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
   /network/configurations/configuration/{configuration-id}/evcs/evc/{evc-id}/relationship-list/relationship:
     put:
       tags:
@@ -52553,16 +46007,6 @@ paths:
           required: true
           type: string
           example: __EVC-ID__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -52641,7 +46085,7 @@ paths:
           example: __EVC-ID__
         - name: body
           in: body
-          description: evc object that needs to be created or updated. 
+          description: evc object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/evc"
@@ -52702,16 +46146,6 @@ paths:
           required: true
           type: string
           example: __CONFIGURATION-ID__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
   /network/configurations/configuration/{configuration-id}:
     get:
       tags:
@@ -52736,16 +46170,6 @@ paths:
           required: true
           type: string
           example: __CONFIGURATION-ID__
-        - name: model-invariant-id
-          in: query
-          description: the ASDC model id for this resource or service model.
-          required: false
-          type: string
-        - name: model-version-id
-          in: query
-          description: the ASDC model version for this resource or service model.
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -52812,7 +46236,7 @@ paths:
           example: __CONFIGURATION-ID__
         - name: body
           in: body
-          description: configuration object that needs to be created or updated. 
+          description: configuration object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/configuration"
@@ -52860,6 +46284,22 @@ paths:
               $ref: "#/getDefinitions/configurations"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: configuration-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-invariant-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: model-version-id
+          in: query
+          description:
+          required: false
+          type: string
   /network/forwarding-paths/forwarding-path/{forwarding-path-id}/relationship-list/relationship:
     put:
       tags:
@@ -53005,11 +46445,6 @@ paths:
           type: integer
           format: int32
           example: __SEQUENCE__
-        - name: forwarding-path-name
-          in: query
-          description: Name of the FP
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -53090,7 +46525,7 @@ paths:
           example: __SEQUENCE__
         - name: body
           in: body
-          description: forwarder object that needs to be created or updated. 
+          description: forwarder object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/forwarder"
@@ -53152,11 +46587,12 @@ paths:
           required: true
           type: string
           example: __FORWARDING-PATH-ID__
-        - name: forwarding-path-name
+        - name: sequence
           in: query
-          description: Name of the FP
+          description:
           required: false
-          type: string
+          type: integer
+          format: int32
   /network/forwarding-paths/forwarding-path/{forwarding-path-id}:
     get:
       tags:
@@ -53181,11 +46617,6 @@ paths:
           required: true
           type: string
           example: __FORWARDING-PATH-ID__
-        - name: forwarding-path-name
-          in: query
-          description: Name of the FP
-          required: false
-          type: string
     put:
       tags:
         - Network
@@ -53252,7 +46683,7 @@ paths:
           example: __FORWARDING-PATH-ID__
         - name: body
           in: body
-          description: forwarding-path object that needs to be created or updated. 
+          description: forwarding-path object that needs to be updated.
           required: true
           schema:
             $ref: "#/patchDefinitions/forwarding-path"
@@ -53300,13 +46731,18 @@ paths:
               $ref: "#/getDefinitions/forwarding-paths"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: forwarding-path-id
+          in: query
+          description:
+          required: false
+          type: string
+        - name: forwarding-path-name
+          in: query
+          description:
+          required: false
+          type: string
 definitions:
-  aai-internal:
-    properties:
-      property-name:
-        type: string
-      property-value:
-        type: string
   action:
     properties:
       action-type:
@@ -53335,21 +46771,24 @@ definitions:
     description: |
       Represents a slice or partial piece of a resource that gets separately allotted
       ###### Related Nodes
-      - TO allotted-resource( allotted-resource tosca.relationships.network.BindsTo allotted-resource, ONE2ONE)
-      - TO generic-vnf( allotted-resource org.onap.relationships.inventory.PartOf generic-vnf, MANY2MANY)
-      - TO instance-group( allotted-resource org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO l3-network( allotted-resource org.onap.relationships.inventory.PartOf l3-network, MANY2MANY)
-      - TO l-interface( allotted-resource org.onap.relationships.inventory.Uses l-interface, ONE2MANY)
-      - TO network-policy( allotted-resource org.onap.relationships.inventory.Uses network-policy, ONE2ONE)
-      - TO vlan( allotted-resource org.onap.relationships.inventory.PartOf vlan, MANY2MANY)
-      - TO vpn-binding( allotted-resource org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2MANY)
-      - TO service-instance( allotted-resource org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
-      - TO model-ver( allotted-resource org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM tunnel-xconnect( tunnel-xconnect org.onap.relationships.inventory.BelongsTo allotted-resource, ONE2ONE)
-      - FROM configuration( configuration org.onap.relationships.inventory.Uses allotted-resource, ONE2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses allotted-resource, MANY2MANY)
-      - FROM allotted-resource( allotted-resource tosca.relationships.network.BindsTo allotted-resource, ONE2ONE)
-      - ALLOTTED-RESOURCE is DELETED when these are DELETED TUNNEL-XCONNECT
+      - TO allotted-resource( allotted-resource BindsTo allotted-resource, ONE2ONE)
+      - TO generic-vnf( allotted-resource PartOf generic-vnf, MANY2MANY)
+      - TO instance-group( allotted-resource MemberOf instance-group, MANY2MANY)
+      - TO l3-network( allotted-resource PartOf l3-network, MANY2MANY)
+      - TO l-interface( allotted-resource Uses l-interface, ONE2MANY)
+      - TO network-policy( allotted-resource Uses network-policy, ONE2ONE)
+      - TO vlan( allotted-resource PartOf vlan, MANY2MANY)
+      - TO vpn-binding( allotted-resource BelongsTo vpn-binding, MANY2MANY)
+      - TO service-instance( allotted-resource BelongsTo service-instance, MANY2ONE)(4)
+      - TO model-ver( allotted-resource IsA model-ver, Many2One)
+      - FROM tunnel-xconnect( tunnel-xconnect BelongsTo allotted-resource, ONE2ONE)(1)
+      - FROM configuration( configuration Uses allotted-resource, ONE2ONE)(3)
+      - FROM service-instance( service-instance Uses allotted-resource, MANY2MANY)
+      - FROM allotted-resource( allotted-resource BindsTo allotted-resource, ONE2ONE)
+
+      -(1) IF this ALLOTTED-RESOURCE node is deleted, this FROM node is DELETED also
+      -(3) IF this FROM node is deleted, this ALLOTTED-RESOURCE is DELETED also
+      -(4) IF this TO node is deleted, this ALLOTTED-RESOURCE is DELETED also
     required:
     - id
     properties:
@@ -53406,15 +46845,18 @@ definitions:
     description: |
       Availability zone, a collection of compute hosts/pservers
       ###### Related Nodes
-      - TO complex( availability-zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO service-capability( availability-zone org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
-      - TO cloud-region( availability-zone org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM ctag-pool( ctag-pool org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
-      - FROM dvs-switch( dvs-switch org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - FROM pserver( pserver org.onap.relationships.inventory.MemberOf availability-zone, MANY2ONE)
-      - FROM vce( vce org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - AVAILABILITY-ZONE cannot be deleted if linked to CTAG-POOL,DVS-SWITCH,GENERIC-VNF,PSERVER,VCE
+      - TO complex( availability-zone LocatedIn complex, MANY2ONE)
+      - TO service-capability( availability-zone AppliesTo service-capability, MANY2MANY)
+      - TO cloud-region( availability-zone BelongsTo cloud-region, MANY2ONE)(4)
+      - FROM ctag-pool( ctag-pool AppliesTo availability-zone, MANY2MANY)
+      - FROM dvs-switch( dvs-switch AppliesTo availability-zone, MANY2MANY)
+      - FROM generic-vnf( generic-vnf Uses availability-zone, MANY2MANY)
+      - FROM pserver( pserver MemberOf availability-zone, MANY2ONE)
+      - FROM vce( vce Uses availability-zone, MANY2MANY)
+
+      -(4) IF this TO node is deleted, this AVAILABILITY-ZONE is DELETED also
+      -AVAILABILITY-ZONE cannot be deleted if related to CTAG-POOL,DVS-SWITCH,GENERIC-VNF,PSERVER,VCE
+
     required:
     - availability-zone-name
     - hypervisor-type
@@ -53482,7 +46924,9 @@ definitions:
   class-of-service:
     description: |
       ###### Related Nodes
-      - TO site-pair( class-of-service org.onap.relationships.inventory.BelongsTo site-pair, MANY2ONE)
+      - TO site-pair( class-of-service BelongsTo site-pair, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this CLASS-OF-SERVICE is DELETED also
     required:
     - cos
     properties:
@@ -53542,26 +46986,28 @@ definitions:
     description: |
       cloud-region designates an installation of a cloud cluster or region or instantiation.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of cloud-region, cloud-region has esr-system-info, One2Many)
-      - TO complex( cloud-region org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO l3-network( cloud-region org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - TO zone( cloud-region org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM availability-zone( availability-zone org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM dvs-switch( dvs-switch org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM flavor( flavor org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM group-assignment( group-assignment org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM image( image org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM oam-network( oam-network org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM snapshot( snapshot org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vip-ipv4-address-list( vip-ipv4-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vip-ipv6-address-list( vip-ipv6-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM volume-group( volume-group org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.LocatedIn cloud-region, MANY2MANY)
-      - FROM pserver( pserver org.onap.relationships.inventory.LocatedIn cloud-region, MANY2ONE)
-      - CLOUD-REGION cannot be deleted if linked to DVS-SWITCH,FLAVOR,GROUP-ASSIGNMENT,IMAGE,OAM-NETWORK,SNAPSHOT,TENANT,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST,VOLUME-GROUP
-      - CLOUD-REGION is DELETED when these are DELETED AVAILABILITY-ZONE
-      - CLOUD-REGION deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - TO complex( cloud-region LocatedIn complex, MANY2ONE)
+      - TO l3-network( cloud-region Uses l3-network, MANY2MANY)
+      - TO zone( cloud-region LocatedIn zone, MANY2ONE)
+      - FROM esr-system-info( esr-system-info BelongsTo cloud-region, MANY2ONE)(1)
+      - FROM availability-zone( availability-zone BelongsTo cloud-region, MANY2ONE)(1)
+      - FROM dvs-switch( dvs-switch BelongsTo cloud-region, MANY2ONE)
+      - FROM flavor( flavor BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-capability( hpa-capability BelongsTo cloud-region, MANY2ONE)
+      - FROM group-assignment( group-assignment BelongsTo cloud-region, MANY2ONE)
+      - FROM image( image BelongsTo cloud-region, MANY2ONE)
+      - FROM oam-network( oam-network BelongsTo cloud-region, MANY2ONE)
+      - FROM snapshot( snapshot BelongsTo cloud-region, MANY2ONE)
+      - FROM tenant( tenant BelongsTo cloud-region, MANY2ONE)
+      - FROM vip-ipv4-address-list( vip-ipv4-address-list BelongsTo cloud-region, MANY2ONE)
+      - FROM vip-ipv6-address-list( vip-ipv6-address-list BelongsTo cloud-region, MANY2ONE)
+      - FROM volume-group( volume-group BelongsTo cloud-region, MANY2ONE)
+      - FROM logical-link( logical-link LocatedIn cloud-region, MANY2MANY)
+      - FROM pserver( pserver LocatedIn cloud-region, MANY2ONE)
+
+      -(1) IF this CLOUD-REGION node is deleted, this FROM node is DELETED also
+      -CLOUD-REGION cannot be deleted if related to DVS-SWITCH,FLAVOR,HPA-CAPABILITY,GROUP-ASSIGNMENT,IMAGE,OAM-NETWORK,SNAPSHOT,TENANT,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST,VOLUME-GROUP
+
     required:
     - cloud-owner
     - cloud-region-id
@@ -53593,6 +47039,7 @@ definitions:
         description: complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.
       sriov-automation:
         type: boolean
+        description: Whether the cloud region supports (true) or does not support (false) SR-IOV automation.
       cloud-extra-info:
         type: string
         description: ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM.
@@ -53650,6 +47097,11 @@ definitions:
         type: array
         items:          
           $ref: "#/definitions/vip-ipv6-address-list"
+      hpa-capabilities:
+        type: array
+        items:
+          $ref: "#/definitions/hpa-capability"
+        description: List of cloud-region specific HPA Capabilities
   cloud-regions:
     properties:
       cloud-region:
@@ -53660,20 +47112,22 @@ definitions:
     description: |
       Collection of physical locations that can house cloud-regions.
       ###### Related Nodes
-      - TO l3-network( complex org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM availability-zone( availability-zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM cloud-region( cloud-region org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM ctag-pool( ctag-pool org.onap.relationships.inventory.BelongsTo complex, MANY2ONE)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - FROM oam-network( oam-network org.onap.relationships.inventory.AppliesTo complex, MANY2MANY)
-      - FROM pnf( pnf org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM pserver( pserver org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM vce( vce org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - FROM volume-group( volume-group org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM vpls-pe( vpls-pe org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM zone( zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - COMPLEX cannot be deleted if linked to AVAILABILITY-ZONE,CLOUD-REGION,GENERIC-VNF,OAM-NETWORK,PNF,PSERVER,VCE,VOLUME-GROUP,VPLS-PE,ZONE
-      - COMPLEX is DELETED when these are DELETED CTAG-POOL
+      - TO l3-network( complex Uses l3-network, MANY2MANY)
+      - FROM availability-zone( availability-zone LocatedIn complex, MANY2ONE)
+      - FROM cloud-region( cloud-region LocatedIn complex, MANY2ONE)
+      - FROM ctag-pool( ctag-pool BelongsTo complex, MANY2ONE)(1)
+      - FROM generic-vnf( generic-vnf LocatedIn complex, MANY2MANY)
+      - FROM oam-network( oam-network AppliesTo complex, MANY2MANY)
+      - FROM pnf( pnf LocatedIn complex, MANY2ONE)
+      - FROM pserver( pserver LocatedIn complex, MANY2ONE)
+      - FROM vce( vce LocatedIn complex, MANY2MANY)
+      - FROM volume-group( volume-group LocatedIn complex, MANY2ONE)
+      - FROM vpls-pe( vpls-pe LocatedIn complex, MANY2ONE)
+      - FROM zone( zone LocatedIn complex, MANY2ONE)
+
+      -(1) IF this COMPLEX node is deleted, this FROM node is DELETED also
+      -COMPLEX cannot be deleted if related to AVAILABILITY-ZONE,CLOUD-REGION,GENERIC-VNF,OAM-NETWORK,PNF,PSERVER,VCE,VOLUME-GROUP,VPLS-PE,ZONE
+
     required:
     - physical-location-id
     - physical-location-type
@@ -53743,19 +47197,21 @@ definitions:
     description: |
       Port Mirror Configuration.
       ###### Related Nodes
-      - TO allotted-resource( configuration org.onap.relationships.inventory.Uses allotted-resource, ONE2ONE)
-      - TO logical-link( configuration org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - TO l-interface( configuration org.onap.relationships.inventory.AppliesTo l-interface, ONE2MANY)
-      - TO pnf( configuration org.onap.relationships.inventory.AppliesTo pnf, ONE2MANY)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo configuration, MANY2ONE)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - FROM forwarding-path( forwarding-path org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - FROM evc( evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
-      - FROM forwarder-evc( forwarder-evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
-      - CONFIGURATION is DELETED when these are DELETED METADATUM,EVC,FORWARDER-EVC
-      - CONFIGURATION deletion means associated objects of these types are also DELETED:ALLOTTED-RESOURCE,LOGICAL-LINK
+      - TO allotted-resource( configuration Uses allotted-resource, ONE2ONE)(2)
+      - TO logical-link( configuration Uses logical-link, ONE2MANY)(2)
+      - TO l-interface( configuration AppliesTo l-interface, ONE2MANY)
+      - TO pnf( configuration AppliesTo pnf, ONE2MANY)
+      - FROM metadatum( metadatum BelongsTo configuration, MANY2ONE)(1)
+      - FROM generic-vnf( generic-vnf Uses configuration, ONE2MANY)(3)
+      - FROM service-instance( service-instance Uses configuration, ONE2MANY)
+      - FROM forwarder( forwarder Uses configuration, ONE2ONE)(3)
+      - FROM forwarding-path( forwarding-path Uses configuration, ONE2ONE)(3)
+      - FROM evc( evc BelongsTo configuration, ONE2ONE)(1)
+      - FROM forwarder-evc( forwarder-evc BelongsTo configuration, ONE2ONE)(1)
+
+      -(1) IF this CONFIGURATION node is deleted, this FROM node is DELETED also
+      -(2) IF this CONFIGURATION node is deleted, this TO node is DELETED also
+      -(3) IF this FROM node is deleted, this CONFIGURATION is DELETED also
     required:
     - configuration-id
     - configuration-type
@@ -53835,10 +47291,11 @@ definitions:
     description: |
       Collection of resource instances used to connect a variety of disparate inventory widgets
       ###### Related Nodes
-      - TO virtual-data-center( connector org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo connector, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses connector, MANY2MANY)
-      - CONNECTOR is DELETED when these are DELETED METADATUM
+      - TO virtual-data-center( connector LocatedIn virtual-data-center, MANY2MANY)
+      - FROM metadatum( metadatum BelongsTo connector, MANY2ONE)(1)
+      - FROM service-instance( service-instance Uses connector, MANY2MANY)
+
+      -(1) IF this CONNECTOR node is deleted, this FROM node is DELETED also
     required:
     - resource-instance-id
     properties:
@@ -53883,10 +47340,12 @@ definitions:
     description: |
       This is how we would capture constraints defining allowed sets of elements.
       ###### Related Nodes
-      - TO model-constraint( constrained-element-set org.onap.relationships.inventory.BelongsTo model-constraint, MANY2ONE)
-      - TO model-element( constrained-element-set org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM element-choice-set( element-choice-set org.onap.relationships.inventory.BelongsTo constrained-element-set, MANY2ONE)
-      - CONSTRAINED-ELEMENT-SET is DELETED when these are DELETED ELEMENT-CHOICE-SET
+      - TO model-constraint( constrained-element-set BelongsTo model-constraint, MANY2ONE)(4)
+      - TO model-element( constrained-element-set BelongsTo model-element, MANY2ONE)(4)
+      - FROM element-choice-set( element-choice-set BelongsTo constrained-element-set, MANY2ONE)(1)
+
+      -(1) IF this CONSTRAINED-ELEMENT-SET node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this CONSTRAINED-ELEMENT-SET is DELETED also
     required:
     - constrained-element-set-uuid
     - constraint-type
@@ -53917,8 +47376,10 @@ definitions:
   ctag-assignment:
     description: |
       ###### Related Nodes
-      - TO l3-network( ctag-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses ctag-assignment, ONE2MANY)
+      - TO l3-network( ctag-assignment BelongsTo l3-network, MANY2ONE)(4)
+      - FROM service-instance( service-instance Uses ctag-assignment, ONE2MANY)
+
+      -(4) IF this TO node is deleted, this CTAG-ASSIGNMENT is DELETED also
     required:
     - vlan-id-inner
     properties:
@@ -53943,10 +47404,12 @@ definitions:
     description: |
       A collection of C tags (vlan tags) grouped for a specific purpose.
       ###### Related Nodes
-      - TO complex( ctag-pool org.onap.relationships.inventory.BelongsTo complex, MANY2ONE)
-      - TO availability-zone( ctag-pool org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
-      - FROM vpls-pe( vpls-pe org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
+      - TO complex( ctag-pool BelongsTo complex, MANY2ONE)(4)
+      - TO availability-zone( ctag-pool AppliesTo availability-zone, MANY2MANY)
+      - FROM generic-vnf( generic-vnf Uses ctag-pool, MANY2MANY)
+      - FROM vpls-pe( vpls-pe Uses ctag-pool, MANY2MANY)
+
+      -(4) IF this TO node is deleted, this CTAG-POOL is DELETED also
     required:
     - target-pe
     - availability-zone-name
@@ -53981,8 +47444,9 @@ definitions:
     description: |
       customer identifiers to provide linkage back to BSS information.
       ###### Related Nodes
-      - FROM service-subscription( service-subscription org.onap.relationships.inventory.BelongsTo customer, MANY2ONE)
-      - CUSTOMER is DELETED when these are DELETED SERVICE-SUBSCRIPTION
+      - FROM service-subscription( service-subscription BelongsTo customer, MANY2ONE)(1)
+
+      -(1) IF this CUSTOMER node is deleted, this FROM node is DELETED also
     required:
     - global-customer-id
     - subscriber-name
@@ -54041,8 +47505,9 @@ definitions:
     description: |
       Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&AI. 
       ###### Related Nodes
-      - TO cloud-region( dvs-switch org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO availability-zone( dvs-switch org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
+      - TO cloud-region( dvs-switch BelongsTo cloud-region, MANY2ONE)
+      - TO availability-zone( dvs-switch AppliesTo availability-zone, MANY2MANY)
+
     required:
     - switch-name
     - vcenter-url
@@ -54118,9 +47583,11 @@ definitions:
     description: |
       This is how we would capture constraints defining allowed sets of elements.
       ###### Related Nodes
-      - TO constrained-element-set( element-choice-set org.onap.relationships.inventory.BelongsTo constrained-element-set, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.BelongsTo element-choice-set, MANY2ONE)
-      - ELEMENT-CHOICE-SET is DELETED when these are DELETED MODEL-ELEMENT
+      - TO constrained-element-set( element-choice-set BelongsTo constrained-element-set, MANY2ONE)(4)
+      - FROM model-element( model-element BelongsTo element-choice-set, MANY2ONE)(1)
+
+      -(1) IF this ELEMENT-CHOICE-SET node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this ELEMENT-CHOICE-SET is DELETED also
     required:
     - element-choice-set-uuid
     - element-choice-set-name
@@ -54151,8 +47618,10 @@ definitions:
     description: |
       Metadata for entitlement group.
       ###### Related Nodes
-      - TO generic-vnf( entitlement org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO vce( entitlement org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
+      - TO generic-vnf( entitlement BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO vce( entitlement BelongsTo vce, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this ENTITLEMENT is DELETED also
     required:
     - group-uuid
     - resource-uuid
@@ -54182,8 +47651,9 @@ definitions:
     description: |
       Persist EMS address information used by EMS driver.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of esr-ems, esr-ems has esr-system-info, One2Many)
-      - ESR-EMS deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - FROM esr-system-info( esr-system-info BelongsTo esr-ems, MANY2ONE)(1)
+
+      -(1) IF this ESR-EMS node is deleted, this FROM node is DELETED also
     required:
     - ems-id
     properties:
@@ -54209,10 +47679,12 @@ definitions:
     description: |
       Persist common address information of external systems.
       ###### Related Nodes
-      - FROM esr-ems (PARENT of esr-system-info, esr-ems has esr-system-info)
-      - FROM esr-vnfm (PARENT of esr-system-info, esr-vnfm has esr-system-info)
-      - FROM esr-thirdparty-sdnc (PARENT of esr-system-info, esr-thirdparty-sdnc has esr-system-info)
-      - FROM cloud-region (PARENT of esr-system-info, cloud-region has esr-system-info)
+      - TO esr-ems( esr-system-info BelongsTo esr-ems, MANY2ONE)(4)
+      - TO esr-vnfm( esr-system-info BelongsTo esr-vnfm, ONE2ONE)(4)
+      - TO esr-thirdparty-sdnc( esr-system-info BelongsTo esr-thirdparty-sdnc, ONE2ONE)(4)
+      - TO cloud-region( esr-system-info BelongsTo cloud-region, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this ESR-SYSTEM-INFO is DELETED also
     required:
     - esr-system-info-id
     - user-name
@@ -54294,9 +47766,10 @@ definitions:
     description: |
       Persist SDNC address information used by ONAP SDNC.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of esr-thirdparty-sdnc, esr-thirdparty-sdnc has esr-system-info, One2One)
-      - TO pnf( esr-thirdparty-sdnc has pnf, One2Many)
-      - ESR-THIRDPARTY-SDNC deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - TO pnf( esr-thirdparty-sdnc AppliesTo pnf, ONE2MANY)
+      - FROM esr-system-info( esr-system-info BelongsTo esr-thirdparty-sdnc, ONE2ONE)(1)
+
+      -(1) IF this ESR-THIRDPARTY-SDNC node is deleted, this FROM node is DELETED also
     required:
     - thirdparty-sdnc-id
     properties:
@@ -54328,8 +47801,9 @@ definitions:
     description: |
       Persist VNFM address information used by VF-C.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of esr-vnfm, esr-vnfm has esr-system-info, One2One)
-      - ESR-VNFM deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - FROM esr-system-info( esr-system-info BelongsTo esr-vnfm, ONE2ONE)(1)
+
+      -(1) IF this ESR-VNFM node is deleted, this FROM node is DELETED also
     required:
     - vnfm-id
     properties:
@@ -54361,7 +47835,9 @@ definitions:
     description: |
       evc object is an optional child object of the Configuration object.
       ###### Related Nodes
-      - TO configuration( evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
+      - TO configuration( evc BelongsTo configuration, ONE2ONE)(4)
+
+      -(4) IF this TO node is deleted, this EVC is DELETED also
     required:
     - evc-id
     properties:
@@ -54451,9 +47927,12 @@ definitions:
     description: |
       Openstack flavor.
       ###### Related Nodes
-      - TO cloud-region( flavor org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vserver( vserver org.onap.relationships.inventory.Uses flavor, MANY2ONE)
-      - FLAVOR cannot be deleted if linked to VSERVER
+      - TO cloud-region( flavor BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-capability( hpa-capability BelongsTo flavor, MANY2ONE)
+      - FROM vserver( vserver Uses flavor, MANY2ONE)
+
+      -FLAVOR cannot be deleted if related to HPA-CAPABILITY,VSERVER
+
     required:
     - flavor-id
     - flavor-name
@@ -54464,7 +47943,7 @@ definitions:
         description: Flavor id, expected to be unique across cloud-region.
       flavor-name:
         type: string
-        description: Flavor name
+        description: Cloud region Flavor name
       flavor-vcpus:
         type: integer
         format: int32
@@ -54493,6 +47972,11 @@ definitions:
       flavor-disabled:
         type: boolean
         description: Boolean as to whether this flavor is no longer enabled
+      hpa-capabilities:
+        type: array
+        items:
+          $ref: "#/definitions/hpa-capability"
+        description: List of flavor specific HPA Capabilities
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -54512,12 +47996,14 @@ definitions:
     description: |
       Entity describing a sequenced segment of forwarding path
       ###### Related Nodes
-      - TO forwarding-path( forwarder org.onap.relationships.inventory.BelongsTo forwarding-path, MANY2ONE)
-      - TO l-interface( forwarder org.onap.relationships.inventory.ForwardsTo l-interface, MANY2ONE)
-      - TO configuration( forwarder org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - TO lag-interface( forwarder org.onap.relationships.inventory.ForwardsTo lag-interface, MANY2ONE)
-      - TO p-interface( forwarder org.onap.relationships.inventory.ForwardsTo p-interface, MANY2ONE)
-      - FORWARDER deletion means associated objects of these types are also DELETED:CONFIGURATION
+      - TO forwarding-path( forwarder BelongsTo forwarding-path, MANY2ONE)(4)
+      - TO l-interface( forwarder ForwardsTo l-interface, MANY2ONE)
+      - TO configuration( forwarder Uses configuration, ONE2ONE)(2)
+      - TO lag-interface( forwarder ForwardsTo lag-interface, MANY2ONE)
+      - TO p-interface( forwarder ForwardsTo p-interface, MANY2ONE)
+
+      -(2) IF this FORWARDER node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this FORWARDER is DELETED also
     required:
     - sequence
     properties:
@@ -54539,7 +48025,9 @@ definitions:
     description: |
       forwarder object is an optional child object of the Configuration object.
       ###### Related Nodes
-      - TO configuration( forwarder-evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
+      - TO configuration( forwarder-evc BelongsTo configuration, ONE2ONE)(4)
+
+      -(4) IF this TO node is deleted, this FORWARDER-EVC is DELETED also
     required:
     - forwarder-evc-id
     properties:
@@ -54581,11 +48069,13 @@ definitions:
     description: |
       Entity that describes the sequenced forwarding path between interfaces of services or resources
       ###### Related Nodes
-      - TO service-instance( forwarding-path org.onap.relationships.inventory.AppliesTo service-instance, MANY2ONE)
-      - TO configuration( forwarding-path org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.BelongsTo forwarding-path, MANY2ONE)
-      - FORWARDING-PATH is DELETED when these are DELETED FORWARDER
-      - FORWARDING-PATH deletion means associated objects of these types are also DELETED:CONFIGURATION
+      - TO service-instance( forwarding-path AppliesTo service-instance, MANY2ONE)(4)
+      - TO configuration( forwarding-path Uses configuration, ONE2ONE)(2)
+      - FROM forwarder( forwarder BelongsTo forwarding-path, MANY2ONE)(1)
+
+      -(1) IF this FORWARDING-PATH node is deleted, this FROM node is DELETED also
+      -(2) IF this FORWARDING-PATH node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this FORWARDING-PATH is DELETED also
     required:
     - forwarding-path-id
     - forwarding-path-name
@@ -54620,44 +48110,41 @@ definitions:
     description: |
       General purpose VNF
       ###### Related Nodes
-      - TO availability-zone( generic-vnf org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - TO complex( generic-vnf org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - TO configuration( generic-vnf org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - TO ctag-pool( generic-vnf org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
-      - TO instance-group( generic-vnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO ipsec-configuration( generic-vnf org.onap.relationships.inventory.Uses ipsec-configuration, MANY2ONE)
-      - TO l3-network( generic-vnf org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - TO license-key-resource( generic-vnf org.onap.relationships.inventory.Uses license-key-resource, MANY2MANY)
-      - TO pnf( generic-vnf tosca.relationships.HostedOn pnf, MANY2MANY)
-      - TO pserver( generic-vnf tosca.relationships.HostedOn pserver, MANY2MANY)
-      - TO vnf-image( generic-vnf org.onap.relationships.inventory.Uses vnf-image, MANY2ONE)
-      - TO volume-group( generic-vnf org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
-      - TO vserver( generic-vnf tosca.relationships.HostedOn vserver, ONE2MANY)
-      - TO virtual-data-center( generic-vnf org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - TO model-ver( generic-vnf org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.PartOf generic-vnf, MANY2MANY)
-      - FROM entitlement( entitlement org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM lag-interface( lag-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM license( license org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM network-profile( network-profile org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf generic-vnf, ONE2MANY)
-      - FROM site-pair-set( site-pair-set org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM line-of-business( line-of-business org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.BridgedTo generic-vnf, MANY2MANY)
-      - FROM platform( platform org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
-      - GENERIC-VNF is DELETED when these are DELETED ENTITLEMENT,VNFC,LAG-INTERFACE,LICENSE,L-INTERFACE,VF-MODULE
-      - GENERIC-VNF deletion means associated objects of these types are also DELETED:CONFIGURATION
+      - TO availability-zone( generic-vnf Uses availability-zone, MANY2MANY)
+      - TO complex( generic-vnf LocatedIn complex, MANY2MANY)
+      - TO configuration( generic-vnf Uses configuration, ONE2MANY)(2)
+      - TO ctag-pool( generic-vnf Uses ctag-pool, MANY2MANY)
+      - TO instance-group( generic-vnf MemberOf instance-group, MANY2MANY)
+      - TO ipsec-configuration( generic-vnf Uses ipsec-configuration, MANY2ONE)
+      - TO l3-network( generic-vnf Uses l3-network, MANY2MANY)
+      - TO license-key-resource( generic-vnf Uses license-key-resource, MANY2MANY)
+      - TO pnf( generic-vnf HostedOn pnf, MANY2MANY)
+      - TO pserver( generic-vnf HostedOn pserver, MANY2MANY)
+      - TO vnf-image( generic-vnf Uses vnf-image, MANY2ONE)
+      - TO volume-group( generic-vnf DependsOn volume-group, ONE2MANY)
+      - TO vserver( generic-vnf HostedOn vserver, ONE2MANY)
+      - TO virtual-data-center( generic-vnf LocatedIn virtual-data-center, MANY2MANY)
+      - TO model-ver( generic-vnf IsA model-ver, Many2One)
+      - FROM allotted-resource( allotted-resource PartOf generic-vnf, MANY2MANY)
+      - FROM entitlement( entitlement BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM vnfc( vnfc BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM lag-interface( lag-interface BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM license( license BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM l-interface( l-interface BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM network-profile( network-profile AppliesTo generic-vnf, MANY2MANY)
+      - FROM service-instance( service-instance ComposedOf generic-vnf, ONE2MANY)
+      - FROM site-pair-set( site-pair-set AppliesTo generic-vnf, MANY2MANY)
+      - FROM vf-module( vf-module BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM line-of-business( line-of-business Uses generic-vnf, MANY2MANY)
+      - FROM logical-link( logical-link BridgedTo generic-vnf, MANY2MANY)
+      - FROM platform( platform Uses generic-vnf, MANY2MANY)
+
+      -(1) IF this GENERIC-VNF node is deleted, this FROM node is DELETED also
+      -(2) IF this GENERIC-VNF node is deleted, this TO node is DELETED also
     required:
     - vnf-id
-    - vnf-instance-id
     - vnf-name
     - vnf-type
-    - vnf-package-name
-    - vnf-discriptor-name
-    - job-id
     - in-maint
     - is-closed-loop-disabled
     properties:
@@ -54761,8 +48248,10 @@ definitions:
         description: number of network in vnf.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       is-closed-loop-disabled:
         type: boolean
+        description: used to indicate whether closed loop function is enabled on this node
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -54873,9 +48362,10 @@ definitions:
     description: |
       Openstack group-assignment used to store exclusivity groups (EG).
       ###### Related Nodes
-      - TO cloud-region( group-assignment org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM pserver( pserver org.onap.relationships.inventory.MemberOf group-assignment, MANY2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.MemberOf group-assignment, MANY2MANY)
+      - TO cloud-region( group-assignment BelongsTo cloud-region, MANY2ONE)
+      - FROM pserver( pserver MemberOf group-assignment, MANY2ONE)
+      - FROM tenant( tenant MemberOf group-assignment, MANY2MANY)
+
     required:
     - group-id
     - group-type
@@ -54911,7 +48401,9 @@ definitions:
   host-route:
     description: |
       ###### Related Nodes
-      - TO subnet( host-route org.onap.relationships.inventory.BelongsTo subnet, MANY2ONE)
+      - TO subnet( host-route BelongsTo subnet, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this HOST-ROUTE is DELETED also
     required:
     - host-route-id
     - route-prefix
@@ -54942,15 +48434,84 @@ definitions:
         type: array
         items:          
           $ref: "#/definitions/host-route"
+  hpa-capabilities:
+    description: |
+      Collection of HPA Capabilities
+    properties:
+      hpa-capability:
+        type: array
+        items:          
+          $ref: "#/definitions/hpa-capability"
+  hpa-capability:
+    description: |
+      Represents a HPA capability
+      ###### Related Nodes
+      - TO flavor( hpa-capability BelongsTo flavor, MANY2ONE)
+      - TO cloud-region( hpa-capability BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-feature-attributes( hpa-feature-attributes BelongsTo hpa-capability, MANY2ONE)(1)
+
+      -(1) IF this HPA-CAPABILITY node is deleted, this FROM node is DELETED also
+    required:
+    - hpa-capability-id
+    - hpa-feature
+    properties:
+      hpa-capability-id:
+        type: string
+        description: UUID to uniquely identify a HPA capability
+      hpa-feature:
+        type: string
+        description: Name of the HPACapability
+      hpa-version:
+        type: string
+        description: HPA schema version
+      architecture:
+        type: string
+        description: Hardware architecture
+      resource-version:
+        type: string
+        description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
+      relationship-list:
+        type: array
+        items:
+          $ref: "#/definitions/relationship"
+      hpa-feature-attributes:
+        type: array
+        items:          
+          $ref: "#/definitions/hpa-feature-attributes"
+  hpa-feature-attributes:
+    description: |
+      HPA Capability Feature attributes
+      ###### Related Nodes
+      - TO hpa-capability( hpa-feature-attributes BelongsTo hpa-capability, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this HPA-FEATURE-ATTRIBUTES is DELETED also
+    required:
+    - hpa-attribute-key
+    properties:
+      hpa-attribute-key:
+        type: string
+        description: name of the specific HPA attribute
+      hpa-attribute-value:
+        type: string
+        description: JSON string specifying the value, unit and type of the specific HPA attribute
+      resource-version:
+        type: string
+        description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
+      relationship-list:
+        type: array
+        items:
+          $ref: "#/definitions/relationship"
   image:
     description: |
       Openstack image.
       ###### Related Nodes
-      - TO cloud-region( image org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo image, MANY2ONE)
-      - FROM vserver( vserver org.onap.relationships.inventory.Uses image, MANY2ONE)
-      - IMAGE cannot be deleted if linked to VSERVER
-      - IMAGE is DELETED when these are DELETED METADATUM
+      - TO cloud-region( image BelongsTo cloud-region, MANY2ONE)
+      - FROM metadatum( metadatum BelongsTo image, MANY2ONE)(1)
+      - FROM vserver( vserver Uses image, MANY2ONE)
+
+      -(1) IF this IMAGE node is deleted, this FROM node is DELETED also
+      -IMAGE cannot be deleted if related to VSERVER
+
     required:
     - image-id
     - image-name
@@ -55023,22 +48584,20 @@ definitions:
     description: |
       General mechanism for grouping instances
       ###### Related Nodes
-      - TO model( instance-group org.onap.relationships.inventory.Targets model, MANY2MANY)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM pnf( pnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM vip-ipv4-address-list( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM vip-ipv6-address-list( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
+      - TO model( instance-group Targets model, MANY2MANY)
+      - FROM allotted-resource( allotted-resource MemberOf instance-group, MANY2MANY)
+      - FROM generic-vnf( generic-vnf MemberOf instance-group, MANY2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - FROM l3-network( l3-network MemberOf instance-group, MANY2MANY)
+      - FROM l-interface( l-interface MemberOf instance-group, MANY2MANY)
+      - FROM pnf( pnf MemberOf instance-group, MANY2MANY)
+      - FROM service-instance( service-instance MemberOf instance-group, MANY2MANY)
+      - FROM vip-ipv4-address-list( vip-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - FROM vip-ipv6-address-list( vip-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - FROM vnfc( vnfc MemberOf instance-group, MANY2MANY)
+
     required:
-    - instance-group-role
-    - model-invariant-id
-    - model-version-id
     - id
     - description
     - type
@@ -55102,13 +48661,9 @@ definitions:
       network:
         type: object
         $ref: "#/definitions/network"
-      aai-internal:
-        type: object
-        $ref: "#/definitions/aai-internal"
       nodes:
-        type: array
-        items:
-          $ref: "#/definitions/aai-internal"
+        type: object
+        $ref: "#/definitions/nodes"
   inventory-item:
     properties:
       inventory-item-type:
@@ -55153,9 +48708,10 @@ definitions:
     description: |
       IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C
       ###### Related Nodes
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses ipsec-configuration, MANY2ONE)
-      - FROM vig-server( vig-server org.onap.relationships.inventory.BelongsTo ipsec-configuration, MANY2ONE)
-      - IPSEC-CONFIGURATION is DELETED when these are DELETED VIG-SERVER
+      - FROM generic-vnf( generic-vnf Uses ipsec-configuration, MANY2ONE)
+      - FROM vig-server( vig-server BelongsTo ipsec-configuration, MANY2ONE)(1)
+
+      -(1) IF this IPSEC-CONFIGURATION node is deleted, this FROM node is DELETED also
     required:
     - ipsec-configuration-id
     properties:
@@ -55249,26 +48805,28 @@ definitions:
     description: |
       Logical interfaces, e.g., a vnic.
       ###### Related Nodes
-      - TO generic-vnf( l-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO lag-interface( l-interface org.onap.relationships.inventory.BelongsTo lag-interface, MANY2ONE)
-      - TO instance-group( l-interface org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO l-interface( l-interface org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - TO logical-link( l-interface tosca.relationships.network.LinksTo logical-link, MANY2MANY)
-      - TO newvce( l-interface org.onap.relationships.inventory.BelongsTo newvce, MANY2ONE)
-      - TO p-interface( l-interface tosca.relationships.network.BindsTo p-interface, MANY2ONE)
-      - TO vserver( l-interface tosca.relationships.network.BindsTo vserver, MANY2ONE)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.Uses l-interface, ONE2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Source l-interface, ONE2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Destination l-interface, ONE2MANY)
-      - FROM sriov-vf( sriov-vf org.onap.relationships.inventory.BelongsTo l-interface, ONE2ONE)
-      - FROM vlan( vlan tosca.relationships.network.LinksTo l-interface, MANY2ONE)
-      - FROM configuration( configuration org.onap.relationships.inventory.AppliesTo l-interface, ONE2MANY)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.ForwardsTo l-interface, MANY2ONE)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - L-INTERFACE is DELETED when these are DELETED L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST,LOGICAL-LINK,SRIOV-VF,VLAN
-      - L-INTERFACE deletion means associated objects of these types are also DELETED:LOGICAL-LINK
+      - TO generic-vnf( l-interface BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO lag-interface( l-interface BelongsTo lag-interface, MANY2ONE)(4)
+      - TO instance-group( l-interface MemberOf instance-group, MANY2MANY)
+      - TO l-interface( l-interface BelongsTo l-interface, MANY2ONE)(4)
+      - TO logical-link( l-interface LinksTo logical-link, MANY2MANY)(2)
+      - TO newvce( l-interface BelongsTo newvce, MANY2ONE)(4)
+      - TO p-interface( l-interface BindsTo p-interface, MANY2ONE)(4)
+      - TO vserver( l-interface BindsTo vserver, MANY2ONE)(4)
+      - FROM allotted-resource( allotted-resource Uses l-interface, ONE2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list BelongsTo l-interface, MANY2ONE)(1)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list BelongsTo l-interface, MANY2ONE)(1)
+      - FROM logical-link( logical-link Source l-interface, ONE2MANY)(1)
+      - FROM logical-link( logical-link Destination l-interface, ONE2MANY)(1)
+      - FROM sriov-vf( sriov-vf BelongsTo l-interface, ONE2ONE)(1)
+      - FROM vlan( vlan LinksTo l-interface, MANY2ONE)(1)
+      - FROM configuration( configuration AppliesTo l-interface, ONE2MANY)
+      - FROM forwarder( forwarder ForwardsTo l-interface, MANY2ONE)
+      - FROM l-interface( l-interface BelongsTo l-interface, MANY2ONE)(4)
+
+      -(1) IF this L-INTERFACE node is deleted, this FROM node is DELETED also
+      -(2) IF this L-INTERFACE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this L-INTERFACE is DELETED also
     required:
     - interface-name
     - is-port-mirrored
@@ -55304,16 +48862,19 @@ definitions:
         description: Human friendly text regarding this interface.
       is-port-mirrored:
         type: boolean
+        description: boolean indicatating whether or not port is a mirrored.
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       prov-status:
         type: string
         description: Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV].
       is-ip-unnumbered:
         type: boolean
+        description: Flag indicating the interface uses the IP Unnumbered configuration.
       allowed-address-pairs:
         type: string
         description: Freeform field for storing an ip address, list of ip addresses or a subnet block.
@@ -55353,12 +48914,14 @@ definitions:
     description: |
       IPv4 Address Range
       ###### Related Nodes
-      - TO instance-group( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - TO l3-network( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - TO subnet( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - TO l-interface( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - TO vlan( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - TO vnfc( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
+      - TO instance-group( l3-interface-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - TO l3-network( l3-interface-ipv4-address-list MemberOf l3-network, MANY2MANY)
+      - TO subnet( l3-interface-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - TO l-interface( l3-interface-ipv4-address-list BelongsTo l-interface, MANY2ONE)(4)
+      - TO vlan( l3-interface-ipv4-address-list BelongsTo vlan, MANY2ONE)(4)
+      - TO vnfc( l3-interface-ipv4-address-list BelongsTo vnfc, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this L3-INTERFACE-IPV4-ADDRESS-LIST is DELETED also
     required:
     - l3-interface-ipv4-address
     properties:
@@ -55397,12 +48960,14 @@ definitions:
     description: |
       IPv6 Address Range
       ###### Related Nodes
-      - TO instance-group( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - TO l3-network( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - TO subnet( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - TO l-interface( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - TO vlan( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - TO vnfc( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
+      - TO instance-group( l3-interface-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - TO l3-network( l3-interface-ipv6-address-list MemberOf l3-network, MANY2MANY)
+      - TO subnet( l3-interface-ipv6-address-list MemberOf subnet, MANY2MANY)
+      - TO l-interface( l3-interface-ipv6-address-list BelongsTo l-interface, MANY2ONE)(4)
+      - TO vlan( l3-interface-ipv6-address-list BelongsTo vlan, MANY2ONE)(4)
+      - TO vnfc( l3-interface-ipv6-address-list BelongsTo vnfc, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this L3-INTERFACE-IPV6-ADDRESS-LIST is DELETED also
     required:
     - l3-interface-ipv6-address
     properties:
@@ -55441,24 +49006,25 @@ definitions:
     description: |
       Generic network definition
       ###### Related Nodes
-      - TO instance-group( l3-network org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO network-policy( l3-network org.onap.relationships.inventory.Uses network-policy, MANY2MANY)
-      - TO route-table-reference( l3-network org.onap.relationships.inventory.Uses route-table-reference, MANY2MANY)
-      - TO vpn-binding( l3-network org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - TO model-ver( l3-network org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.PartOf l3-network, MANY2MANY)
-      - FROM cloud-region( cloud-region org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM complex( complex org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - FROM ctag-assignment( ctag-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM segmentation-assignment( segmentation-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf l3-network, ONE2MANY)
-      - FROM subnet( subnet org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.DependsOn l3-network, MANY2MANY)
-      - L3-NETWORK is DELETED when these are DELETED CTAG-ASSIGNMENT,SEGMENTATION-ASSIGNMENT,SUBNET
+      - TO instance-group( l3-network MemberOf instance-group, MANY2MANY)
+      - TO network-policy( l3-network Uses network-policy, MANY2MANY)
+      - TO route-table-reference( l3-network Uses route-table-reference, MANY2MANY)
+      - TO vpn-binding( l3-network Uses vpn-binding, MANY2MANY)
+      - TO model-ver( l3-network IsA model-ver, Many2One)
+      - FROM allotted-resource( allotted-resource PartOf l3-network, MANY2MANY)
+      - FROM cloud-region( cloud-region Uses l3-network, MANY2MANY)
+      - FROM complex( complex Uses l3-network, MANY2MANY)
+      - FROM generic-vnf( generic-vnf Uses l3-network, MANY2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list MemberOf l3-network, MANY2MANY)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list MemberOf l3-network, MANY2MANY)
+      - FROM ctag-assignment( ctag-assignment BelongsTo l3-network, MANY2ONE)(1)
+      - FROM segmentation-assignment( segmentation-assignment BelongsTo l3-network, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf l3-network, ONE2MANY)
+      - FROM subnet( subnet BelongsTo l3-network, MANY2ONE)(1)
+      - FROM tenant( tenant Uses l3-network, MANY2MANY)
+      - FROM vf-module( vf-module DependsOn l3-network, MANY2MANY)
+
+      -(1) IF this L3-NETWORK node is deleted, this FROM node is DELETED also
     required:
     - network-id
     - network-name
@@ -55487,6 +49053,7 @@ definitions:
         description: Neutron network id of this Interface
       is-bound-to-vpn:
         type: boolean
+        description: Set to true if bound to VPN
       service-id:
         type: string
         description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
@@ -55532,10 +49099,13 @@ definitions:
         description: Name associated with the physical network.
       is-provider-network:
         type: boolean
+        description: boolean indicatating whether or not network is a provider network.
       is-shared-network:
         type: boolean
+        description: boolean indicatating whether or not network is a shared network.
       is-external-network:
         type: boolean
+        description: boolean indicatating whether or not network is an external network.
       selflink:
         type: string
         description: Path to the controller object.
@@ -55569,17 +49139,19 @@ definitions:
     description: |
       Link aggregate interface
       ###### Related Nodes
-      - TO generic-vnf( lag-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO lag-link( lag-interface tosca.relationships.network.LinksTo lag-link, MANY2MANY)
-      - TO logical-link( lag-interface org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - TO p-interface( lag-interface org.onap.relationships.inventory.Uses p-interface, MANY2MANY)
-      - TO pnf( lag-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - TO pserver( lag-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - TO vpls-pe( lag-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo lag-interface, MANY2ONE)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.ForwardsTo lag-interface, MANY2ONE)
-      - LAG-INTERFACE is DELETED when these are DELETED L-INTERFACE
-      - LAG-INTERFACE deletion means associated objects of these types are also DELETED:LAG-LINK,LOGICAL-LINK
+      - TO generic-vnf( lag-interface BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO lag-link( lag-interface LinksTo lag-link, MANY2MANY)(2)
+      - TO logical-link( lag-interface Uses logical-link, MANY2MANY)(2)
+      - TO p-interface( lag-interface Uses p-interface, MANY2MANY)
+      - TO pnf( lag-interface BindsTo pnf, MANY2ONE)(4)
+      - TO pserver( lag-interface BindsTo pserver, MANY2ONE)(4)
+      - TO vpls-pe( lag-interface BindsTo vpls-pe, MANY2ONE)(4)
+      - FROM l-interface( l-interface BelongsTo lag-interface, MANY2ONE)(1)
+      - FROM forwarder( forwarder ForwardsTo lag-interface, MANY2ONE)
+
+      -(1) IF this LAG-INTERFACE node is deleted, this FROM node is DELETED also
+      -(2) IF this LAG-INTERFACE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this LAG-INTERFACE is DELETED also
     required:
     - interface-name
     - in-maint
@@ -55610,6 +49182,7 @@ definitions:
         description: Trigger for operational monitoring of this resource by Service Assurance systems.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       relationship-list:
         type: array
         items:
@@ -55630,8 +49203,10 @@ definitions:
     description: |
       LAG links can connect lag-interfaces
       ###### Related Nodes
-      - FROM lag-interface( lag-interface tosca.relationships.network.LinksTo lag-link, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Uses lag-link, MANY2MANY)
+      - FROM lag-interface( lag-interface LinksTo lag-link, MANY2MANY)(3)
+      - FROM logical-link( logical-link Uses lag-link, MANY2MANY)
+
+      -(3) IF this FROM node is deleted, this LAG-LINK is DELETED also
     required:
     - link-name
     properties:
@@ -55657,8 +49232,10 @@ definitions:
     description: |
       Metadata for license group.
       ###### Related Nodes
-      - TO generic-vnf( license org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO vce( license org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
+      - TO generic-vnf( license BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO vce( license BelongsTo vce, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this LICENSE is DELETED also
     required:
     - group-uuid
     - resource-uuid
@@ -55688,7 +49265,8 @@ definitions:
     description: |
       describes a line-of-business
       ###### Related Nodes
-      - TO generic-vnf( line-of-business org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
+      - TO generic-vnf( line-of-business Uses generic-vnf, MANY2MANY)
+
     required:
     - line-of-business-name
     properties:
@@ -55714,24 +49292,27 @@ definitions:
     description: |
       Logical links generally connect l-interfaces but are used to express logical connectivity between two points
       ###### Related Nodes
-      - TO l-interface( logical-link org.onap.relationships.inventory.Source l-interface, ONE2MANY)
-      - TO l-interface( logical-link org.onap.relationships.inventory.Destination l-interface, ONE2MANY)
-      - TO cloud-region( logical-link org.onap.relationships.inventory.LocatedIn cloud-region, MANY2MANY)
-      - TO generic-vnf( logical-link org.onap.relationships.inventory.BridgedTo generic-vnf, MANY2MANY)
-      - TO lag-link( logical-link org.onap.relationships.inventory.Uses lag-link, MANY2MANY)
-      - TO logical-link( logical-link org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - TO pnf( logical-link org.onap.relationships.inventory.BridgedTo pnf, MANY2MANY)
-      - TO pserver( logical-link org.onap.relationships.inventory.BridgedTo pserver, MANY2MANY)
-      - TO vpn-binding( logical-link org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - TO virtual-data-center( logical-link org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - TO model-ver( logical-link org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM configuration( configuration org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - FROM lag-interface( lag-interface org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - FROM l-interface( l-interface tosca.relationships.network.LinksTo logical-link, MANY2MANY)
-      - FROM p-interface( p-interface tosca.relationships.network.LinksTo logical-link, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - FROM vlan( vlan org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
+      - TO l-interface( logical-link Source l-interface, ONE2MANY)(4)
+      - TO l-interface( logical-link Destination l-interface, ONE2MANY)(4)
+      - TO cloud-region( logical-link LocatedIn cloud-region, MANY2MANY)
+      - TO generic-vnf( logical-link BridgedTo generic-vnf, MANY2MANY)
+      - TO lag-link( logical-link Uses lag-link, MANY2MANY)
+      - TO logical-link( logical-link Uses logical-link, MANY2MANY)
+      - TO pnf( logical-link BridgedTo pnf, MANY2MANY)
+      - TO pserver( logical-link BridgedTo pserver, MANY2MANY)
+      - TO vpn-binding( logical-link Uses vpn-binding, MANY2MANY)
+      - TO virtual-data-center( logical-link LocatedIn virtual-data-center, MANY2MANY)
+      - TO model-ver( logical-link IsA model-ver, Many2One)
+      - FROM configuration( configuration Uses logical-link, ONE2MANY)(3)
+      - FROM lag-interface( lag-interface Uses logical-link, MANY2MANY)(3)
+      - FROM l-interface( l-interface LinksTo logical-link, MANY2MANY)(3)
+      - FROM p-interface( p-interface LinksTo logical-link, MANY2ONE)
+      - FROM service-instance( service-instance Uses logical-link, ONE2MANY)(3)
+      - FROM vlan( vlan Uses logical-link, MANY2MANY)(3)
+      - FROM logical-link( logical-link Uses logical-link, MANY2MANY)
+
+      -(3) IF this FROM node is deleted, this LOGICAL-LINK is DELETED also
+      -(4) IF this TO node is deleted, this LOGICAL-LINK is DELETED also
     required:
     - link-name
     - in-maint
@@ -55742,6 +49323,7 @@ definitions:
         description: e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       link-type:
         type: string
         description: Type of logical link, e.g., evc
@@ -55820,11 +49402,13 @@ definitions:
     description: |
       Key/value pairs
       ###### Related Nodes
-      - TO configuration( metadatum org.onap.relationships.inventory.BelongsTo configuration, MANY2ONE)
-      - TO connector( metadatum org.onap.relationships.inventory.BelongsTo connector, MANY2ONE)
-      - TO image( metadatum org.onap.relationships.inventory.BelongsTo image, MANY2ONE)
-      - TO model-ver( metadatum org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - TO service-instance( metadatum org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
+      - TO configuration( metadatum BelongsTo configuration, MANY2ONE)(4)
+      - TO connector( metadatum BelongsTo connector, MANY2ONE)(4)
+      - TO image( metadatum BelongsTo image, MANY2ONE)(4)
+      - TO model-ver( metadatum BelongsTo model-ver, MANY2ONE)(4)
+      - TO service-instance( metadatum BelongsTo service-instance, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this METADATUM is DELETED also
     required:
     - metaname
     - metaval
@@ -55840,13 +49424,15 @@ definitions:
     description: |
       Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version
       ###### Related Nodes
-      - TO model( model-ver org.onap.relationships.inventory.BelongsTo model, MANY2ONE)
-      - FROM instance-group( instance-group org.onap.relationships.inventory.Targets model, MANY2MANY)
-      - FROM model-ver( model-ver org.onap.relationships.inventory.BelongsTo model, MANY2ONE)
-      - FROM named-query( named-query org.onap.relationships.inventory.AppliesTo model, ONE2MANY)
-      - FROM named-query-element( named-query-element org.onap.relationships.inventory.IsA model, MANY2ONE)
-      - MODEL cannot be deleted if linked to INSTANCE-GROUP,NAMED-QUERY,NAMED-QUERY-ELEMENT
-      - MODEL is DELETED when these are DELETED MODEL-VER
+      - TO model( model-ver BelongsTo model, MANY2ONE)(1)
+      - FROM instance-group( instance-group Targets model, MANY2MANY)
+      - FROM model-ver( model-ver BelongsTo model, MANY2ONE)(1)
+      - FROM named-query( named-query AppliesTo model, ONE2MANY)
+      - FROM named-query-element( named-query-element IsA model, MANY2ONE)
+
+      -(1) IF this MODEL node is deleted, this FROM node is DELETED also
+      -MODEL cannot be deleted if related to INSTANCE-GROUP,NAMED-QUERY,NAMED-QUERY-ELEMENT
+
     required:
     - model-invariant-id
     - model-type
@@ -55889,9 +49475,11 @@ definitions:
     description: |
       This is how we would capture constraints defining allowed sets of elements.
       ###### Related Nodes
-      - TO model-element( model-constraint org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM constrained-element-set( constrained-element-set org.onap.relationships.inventory.BelongsTo model-constraint, MANY2ONE)
-      - MODEL-CONSTRAINT is DELETED when these are DELETED CONSTRAINED-ELEMENT-SET
+      - TO model-element( model-constraint BelongsTo model-element, MANY2ONE)(4)
+      - FROM constrained-element-set( constrained-element-set BelongsTo model-constraint, MANY2ONE)(1)
+
+      -(1) IF this MODEL-CONSTRAINT node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this MODEL-CONSTRAINT is DELETED also
     required:
     - model-constraint-uuid
     - constrained-element-set-uuid-to-replace
@@ -55917,14 +49505,16 @@ definitions:
     description: |
       Defines how other models combine to make up a higher-level model.
       ###### Related Nodes
-      - TO element-choice-set( model-element org.onap.relationships.inventory.BelongsTo element-choice-set, MANY2ONE)
-      - TO model-element( model-element org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - TO model-ver( model-element org.onap.relationships.inventory.IsA model-ver, MANY2ONE)
-      - TO model-ver( model-element org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - FROM constrained-element-set( constrained-element-set org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM model-constraint( model-constraint org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - MODEL-ELEMENT is DELETED when these are DELETED CONSTRAINED-ELEMENT-SET,MODEL-CONSTRAINT
+      - TO element-choice-set( model-element BelongsTo element-choice-set, MANY2ONE)(4)
+      - TO model-element( model-element BelongsTo model-element, MANY2ONE)(4)
+      - TO model-ver( model-element IsA model-ver, MANY2ONE)
+      - TO model-ver( model-element BelongsTo model-ver, MANY2ONE)(4)
+      - FROM constrained-element-set( constrained-element-set BelongsTo model-element, MANY2ONE)(1)
+      - FROM model-constraint( model-constraint BelongsTo model-element, MANY2ONE)(1)
+      - FROM model-element( model-element BelongsTo model-element, MANY2ONE)(4)
+
+      -(1) IF this MODEL-ELEMENT node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this MODEL-ELEMENT is DELETED also
     required:
     - model-element-uuid
     - new-data-del-flag
@@ -55967,18 +49557,21 @@ definitions:
     description: |
       Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models
       ###### Related Nodes
-      - TO model( model-ver org.onap.relationships.inventory.BelongsTo model, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.IsA model-ver, MANY2ONE)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - MODEL-VER cannot be deleted if linked to MODEL-ELEMENT
-      - MODEL-VER is DELETED when these are DELETED METADATUM,MODEL-ELEMENT
+      - TO model( model-ver BelongsTo model, MANY2ONE)(4)
+      - FROM model-element( model-element IsA model-ver, MANY2ONE)
+      - FROM metadatum( metadatum BelongsTo model-ver, MANY2ONE)(1)
+      - FROM model-element( model-element BelongsTo model-ver, MANY2ONE)(1)
+      - FROM allotted-resource( allotted-resource IsA model-ver, Many2One)
+      - FROM generic-vnf( generic-vnf IsA model-ver, Many2One)
+      - FROM l3-network( l3-network IsA model-ver, Many2One)
+      - FROM logical-link( logical-link IsA model-ver, Many2One)
+      - FROM service-instance( service-instance IsA model-ver, Many2One)
+      - FROM vf-module( vf-module IsA model-ver, Many2One)
+
+      -(1) IF this MODEL-VER node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this MODEL-VER is DELETED also
+      -MODEL-VER cannot be deleted if related to MODEL-ELEMENT
+
     required:
     - model-version-id
     - model-name
@@ -56031,7 +49624,8 @@ definitions:
   multicast-configuration:
     description: |
       ###### Related Nodes
-      - FROM vlan( vlan org.onap.relationships.inventory.Uses multicast-configuration, MANY2MANY)
+      - FROM vlan( vlan Uses multicast-configuration, MANY2MANY)
+
     required:
     - multicast-configuration-id
     - multicast-protocol
@@ -56071,10 +49665,11 @@ definitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query( named-query-element org.onap.relationships.inventory.BelongsTo named-query, ONE2ONE)
-      - TO model( named-query org.onap.relationships.inventory.AppliesTo model, ONE2MANY)
-      - FROM named-query-element( named-query-element org.onap.relationships.inventory.BelongsTo named-query, ONE2ONE)
-      - NAMED-QUERY is DELETED when these are DELETED NAMED-QUERY-ELEMENT
+      - TO named-query( named-query-element BelongsTo named-query, ONE2ONE)(1)
+      - TO model( named-query AppliesTo model, ONE2MANY)
+      - FROM named-query-element( named-query-element BelongsTo named-query, ONE2ONE)(1)
+
+      -(1) IF this NAMED-QUERY node is deleted, this FROM node is DELETED also
     required:
     - named-query-uuid
     - named-query-name
@@ -56104,13 +49699,15 @@ definitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query( named-query-element org.onap.relationships.inventory.BelongsTo named-query, ONE2ONE)
-      - TO model( named-query-element org.onap.relationships.inventory.IsA model, MANY2ONE)
-      - TO named-query-element( named-query-element org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - FROM property-constraint( property-constraint org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - FROM related-lookup( related-lookup org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - FROM named-query-element( named-query-element org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - NAMED-QUERY-ELEMENT is DELETED when these are DELETED PROPERTY-CONSTRAINT,RELATED-LOOKUP
+      - TO named-query( named-query-element BelongsTo named-query, ONE2ONE)(4)
+      - TO model( named-query-element IsA model, MANY2ONE)
+      - TO named-query-element( named-query-element BelongsTo named-query-element, MANY2ONE)(4)
+      - FROM property-constraint( property-constraint BelongsTo named-query-element, MANY2ONE)(1)
+      - FROM related-lookup( related-lookup BelongsTo named-query-element, MANY2ONE)(1)
+      - FROM named-query-element( named-query-element BelongsTo named-query-element, MANY2ONE)(4)
+
+      -(1) IF this NAMED-QUERY-ELEMENT node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this NAMED-QUERY-ELEMENT is DELETED also
     required:
     - named-query-element-uuid
     properties:
@@ -56239,8 +49836,9 @@ definitions:
   network-policy:
     description: |
       ###### Related Nodes
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.Uses network-policy, ONE2ONE)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.Uses network-policy, MANY2MANY)
+      - FROM allotted-resource( allotted-resource Uses network-policy, ONE2ONE)
+      - FROM l3-network( l3-network Uses network-policy, MANY2MANY)
+
     required:
     - network-policy-id
     properties:
@@ -56264,7 +49862,8 @@ definitions:
     description: |
       Network profile populated by SDN-GP for SNMP
       ###### Related Nodes
-      - TO generic-vnf( network-profile org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
+      - TO generic-vnf( network-profile AppliesTo generic-vnf, MANY2MANY)
+
     required:
     - nm-profile-name
     properties:
@@ -56293,8 +49892,9 @@ definitions:
     description: |
       This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.
       ###### Related Nodes
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo newvce, MANY2ONE)
-      - NEWVCE is DELETED when these are DELETED L-INTERFACE
+      - FROM l-interface( l-interface BelongsTo newvce, MANY2ONE)(1)
+
+      -(1) IF this NEWVCE node is deleted, this FROM node is DELETED also
     required:
     - vnf-id2
     - vnf-name
@@ -56358,6 +49958,12 @@ definitions:
         type: array
         items:          
           $ref: "#/definitions/newvce"
+  nodes:
+    properties:
+      inventory-item-data:
+        type: array
+        items:
+          $ref: "#/definitions/inventory-item-data"
   notification-event:
     properties:
       cambria.partition:
@@ -56413,9 +50019,10 @@ definitions:
     description: |
       OAM network, to be deprecated shortly.  Do not use for new purposes. 
       ###### Related Nodes
-      - TO cloud-region( oam-network org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO complex( oam-network org.onap.relationships.inventory.AppliesTo complex, MANY2MANY)
-      - TO service-capability( oam-network org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
+      - TO cloud-region( oam-network BelongsTo cloud-region, MANY2ONE)
+      - TO complex( oam-network AppliesTo complex, MANY2MANY)
+      - TO service-capability( oam-network AppliesTo service-capability, MANY2MANY)
+
     required:
     - network-uuid
     - network-name
@@ -56457,8 +50064,9 @@ definitions:
     description: |
       It is a logical partition of the cloud which allows to have multiple environments in the production AIC.
       ###### Related Nodes
-      - TO operational-environment( operational-environment org.onap.relationships.inventory.Uses operational-environment, ONE2ONE)
-      - FROM operational-environment( operational-environment org.onap.relationships.inventory.Uses operational-environment, ONE2ONE)
+      - TO operational-environment( operational-environment Uses operational-environment, ONE2ONE)
+      - FROM operational-environment( operational-environment Uses operational-environment, ONE2ONE)
+
     required:
     - operational-environment-id
     - operational-environment-name
@@ -56553,7 +50161,8 @@ definitions:
     description: |
       describes an owning-entity
       ###### Related Nodes
-      - FROM service-instance( service-instance org.onap.relationships.inventory.BelongsTo owning-entity, MANY2ONE)
+      - FROM service-instance( service-instance BelongsTo owning-entity, MANY2ONE)
+
     required:
     - owning-entity-id
     - owning-entity-name
@@ -56575,17 +50184,19 @@ definitions:
     description: |
       Physical interface (e.g., nic)
       ###### Related Nodes
-      - TO logical-link( p-interface tosca.relationships.network.LinksTo logical-link, MANY2ONE)
-      - TO physical-link( p-interface tosca.relationships.network.LinksTo physical-link, MANY2ONE)
-      - TO pnf( p-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - TO pserver( p-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - TO vpls-pe( p-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - FROM lag-interface( lag-interface org.onap.relationships.inventory.Uses p-interface, MANY2MANY)
-      - FROM l-interface( l-interface tosca.relationships.network.BindsTo p-interface, MANY2ONE)
-      - FROM sriov-pf( sriov-pf org.onap.relationships.inventory.BelongsTo p-interface, ONE2ONE)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.ForwardsTo p-interface, MANY2ONE)
-      - P-INTERFACE is DELETED when these are DELETED L-INTERFACE,SRIOV-PF
-      - P-INTERFACE deletion means associated objects of these types are also DELETED:PHYSICAL-LINK
+      - TO logical-link( p-interface LinksTo logical-link, MANY2ONE)
+      - TO physical-link( p-interface LinksTo physical-link, MANY2ONE)(2)
+      - TO pnf( p-interface BindsTo pnf, MANY2ONE)(4)
+      - TO pserver( p-interface BindsTo pserver, MANY2ONE)(4)
+      - TO vpls-pe( p-interface BindsTo vpls-pe, MANY2ONE)(4)
+      - FROM lag-interface( lag-interface Uses p-interface, MANY2MANY)
+      - FROM l-interface( l-interface BindsTo p-interface, MANY2ONE)(1)
+      - FROM sriov-pf( sriov-pf BelongsTo p-interface, ONE2ONE)(1)
+      - FROM forwarder( forwarder ForwardsTo p-interface, MANY2ONE)
+
+      -(1) IF this P-INTERFACE node is deleted, this FROM node is DELETED also
+      -(2) IF this P-INTERFACE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this P-INTERFACE is DELETED also
     required:
     - interface-name
     - in-maint
@@ -56625,6 +50236,7 @@ definitions:
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       inv-status:
         type: string
         description: inventory status
@@ -56652,7 +50264,9 @@ definitions:
     description: |
       Collection of physical connections, typically between p-interfaces
       ###### Related Nodes
-      - FROM p-interface( p-interface tosca.relationships.network.LinksTo physical-link, MANY2ONE)
+      - FROM p-interface( p-interface LinksTo physical-link, MANY2ONE)(3)
+
+      -(3) IF this FROM node is deleted, this PHYSICAL-LINK is DELETED also
     required:
     - link-name
     properties:
@@ -56710,7 +50324,8 @@ definitions:
     description: |
       describes a platform
       ###### Related Nodes
-      - TO generic-vnf( platform org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
+      - TO generic-vnf( platform Uses generic-vnf, MANY2MANY)
+
     required:
     - platform-name
     properties:
@@ -56736,17 +50351,18 @@ definitions:
     description: |
       PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.
       ###### Related Nodes
-      - TO complex( pnf org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO instance-group( pnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO zone( pnf org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM esr-thirdparty-sdnc( esr-thirdparty-sdnc has pnf, One2Many)
-      - FROM generic-vnf( generic-vnf tosca.relationships.HostedOn pnf, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.BridgedTo pnf, MANY2MANY)
-      - FROM lag-interface( lag-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - FROM p-interface( p-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf pnf, ONE2MANY)
-      - FROM configuration( configuration org.onap.relationships.inventory.AppliesTo pnf, ONE2MANY)
-      - PNF is DELETED when these are DELETED LAG-INTERFACE,P-INTERFACE
+      - TO complex( pnf LocatedIn complex, MANY2ONE)
+      - TO instance-group( pnf MemberOf instance-group, MANY2MANY)
+      - TO zone( pnf LocatedIn zone, MANY2ONE)
+      - FROM esr-thirdparty-sdnc( esr-thirdparty-sdnc AppliesTo pnf, ONE2MANY)
+      - FROM generic-vnf( generic-vnf HostedOn pnf, MANY2MANY)
+      - FROM logical-link( logical-link BridgedTo pnf, MANY2MANY)
+      - FROM lag-interface( lag-interface BindsTo pnf, MANY2ONE)(1)
+      - FROM p-interface( p-interface BindsTo pnf, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf pnf, ONE2MANY)
+      - FROM configuration( configuration AppliesTo pnf, ONE2MANY)
+
+      -(1) IF this PNF node is deleted, this FROM node is DELETED also
     required:
     - pnf-name
     - in-maint
@@ -56786,6 +50402,7 @@ definitions:
         description: sw-version is the version of SW for the hosted application on the PNF.
       in-maint:
         type: boolean
+        description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       frame-id:
         type: string
         description: ID of the physical frame (relay rack) where pnf is installed.
@@ -56843,9 +50460,11 @@ definitions:
     description: |
       Used to capture the network interfaces of this VCE
       ###### Related Nodes
-      - TO vce( port-group org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM cvlan-tag( cvlan-tag org.onap.relationships.inventory.BelongsTo port-group, MANY2ONE)
-      - PORT-GROUP is DELETED when these are DELETED CVLAN-TAG
+      - TO vce( port-group BelongsTo vce, MANY2ONE)(4)
+      - FROM cvlan-tag( cvlan-tag BelongsTo port-group, MANY2ONE)(1)
+
+      -(1) IF this PORT-GROUP node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this PORT-GROUP is DELETED also
     required:
     - interface-id
     - orchestration-status
@@ -56901,7 +50520,8 @@ definitions:
     description: |
       describes the project
       ###### Related Nodes
-      - TO service-instance( project org.onap.relationships.inventory.Uses service-instance, ONE2MANY)
+      - TO service-instance( project Uses service-instance, ONE2MANY)
+
     required:
     - project-name
     properties:
@@ -56935,7 +50555,9 @@ definitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query-element( property-constraint org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
+      - TO named-query-element( property-constraint BelongsTo named-query-element, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this PROPERTY-CONSTRAINT is DELETED also
     required:
     - property-constraint-uuid
     - constraint-type
@@ -56962,19 +50584,20 @@ definitions:
     description: |
       Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.
       ###### Related Nodes
-      - TO group-assignment( pserver org.onap.relationships.inventory.MemberOf group-assignment, MANY2ONE)
-      - TO availability-zone( pserver org.onap.relationships.inventory.MemberOf availability-zone, MANY2ONE)
-      - TO cloud-region( pserver org.onap.relationships.inventory.LocatedIn cloud-region, MANY2ONE)
-      - TO complex( pserver org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO zone( pserver org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM generic-vnf( generic-vnf tosca.relationships.HostedOn pserver, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.BridgedTo pserver, MANY2MANY)
-      - FROM lag-interface( lag-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - FROM p-interface( p-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - FROM vserver( vserver tosca.relationships.HostedOn pserver, MANY2ONE)
-      - PSERVER cannot be deleted if linked to GENERIC-VNF,LOGICAL-LINK,VSERVER
-      - PSERVER is DELETED when these are DELETED LAG-INTERFACE,P-INTERFACE
-      - PSERVER cannot be deleted if linked to GROUP-ASSIGNMENT
+      - TO group-assignment( pserver MemberOf group-assignment, MANY2ONE)
+      - TO availability-zone( pserver MemberOf availability-zone, MANY2ONE)
+      - TO cloud-region( pserver LocatedIn cloud-region, MANY2ONE)
+      - TO complex( pserver LocatedIn complex, MANY2ONE)
+      - TO zone( pserver LocatedIn zone, MANY2ONE)
+      - FROM generic-vnf( generic-vnf HostedOn pserver, MANY2MANY)
+      - FROM logical-link( logical-link BridgedTo pserver, MANY2MANY)
+      - FROM lag-interface( lag-interface BindsTo pserver, MANY2ONE)(1)
+      - FROM p-interface( p-interface BindsTo pserver, MANY2ONE)(1)
+      - FROM vserver( vserver HostedOn pserver, MANY2ONE)
+
+      -(1) IF this PSERVER node is deleted, this FROM node is DELETED also
+      -PSERVER cannot be deleted if related to GENERIC-VNF,LOGICAL-LINK,VSERVER,GROUP-ASSIGNMENT
+
     required:
     - hostname
     - in-maint
@@ -57044,6 +50667,7 @@ definitions:
         description: internet topology of Pserver
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -57096,7 +50720,9 @@ definitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query-element( related-lookup org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
+      - TO named-query-element( related-lookup BelongsTo named-query-element, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this RELATED-LOOKUP is DELETED also
     required:
     - related-lookup-uuid
     - source-node-type
@@ -57207,7 +50833,8 @@ definitions:
     description: |
       Openstack route table reference.
       ###### Related Nodes
-      - FROM l3-network( l3-network org.onap.relationships.inventory.Uses route-table-reference, MANY2MANY)
+      - FROM l3-network( l3-network Uses route-table-reference, MANY2MANY)
+
     required:
     - route-table-reference-id
     - route-table-reference-fqdn
@@ -57237,7 +50864,9 @@ definitions:
     description: |
       Route target information
       ###### Related Nodes
-      - TO vpn-binding( route-target org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2ONE)
+      - TO vpn-binding( route-target BelongsTo vpn-binding, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this ROUTE-TARGET is DELETED also
     required:
     - global-route-target
     - route-target-role
@@ -57266,9 +50895,11 @@ definitions:
   routing-instance:
     description: |
       ###### Related Nodes
-      - TO site-pair-set( routing-instance org.onap.relationships.inventory.BelongsTo site-pair-set, MANY2ONE)
-      - FROM site-pair( site-pair org.onap.relationships.inventory.BelongsTo routing-instance, MANY2ONE)
-      - ROUTING-INSTANCE is DELETED when these are DELETED SITE-PAIR
+      - TO site-pair-set( routing-instance BelongsTo site-pair-set, MANY2ONE)(4)
+      - FROM site-pair( site-pair BelongsTo routing-instance, MANY2ONE)(1)
+
+      -(1) IF this ROUTING-INSTANCE node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this ROUTING-INSTANCE is DELETED also
     required:
     - routing-instance-id
     properties:
@@ -57349,7 +50980,9 @@ definitions:
     description: |
       Openstack segmentation assignment.
       ###### Related Nodes
-      - TO l3-network( segmentation-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
+      - TO l3-network( segmentation-assignment BelongsTo l3-network, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this SEGMENTATION-ASSIGNMENT is DELETED also
     required:
     - segmentation-id
     properties:
@@ -57409,9 +51042,11 @@ definitions:
     description: |
       Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.
       ###### Related Nodes
-      - FROM availability-zone( availability-zone org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
-      - FROM oam-network( oam-network org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
-      - SERVICE-CAPABILITY cannot be deleted if linked to AVAILABILITY-ZONE,OAM-NETWORK
+      - FROM availability-zone( availability-zone AppliesTo service-capability, MANY2MANY)
+      - FROM oam-network( oam-network AppliesTo service-capability, MANY2MANY)
+
+      -SERVICE-CAPABILITY cannot be deleted if related to AVAILABILITY-ZONE,OAM-NETWORK
+
     required:
     - service-type
     - vnf-type
@@ -57457,37 +51092,34 @@ definitions:
     description: |
       Instance of a service
       ###### Related Nodes
-      - TO generic-vnf( service-instance org.onap.relationships.inventory.ComposedOf generic-vnf, ONE2MANY)
-      - TO l3-network( service-instance org.onap.relationships.inventory.ComposedOf l3-network, ONE2MANY)
-      - TO owning-entity( service-instance org.onap.relationships.inventory.BelongsTo owning-entity, MANY2ONE)
-      - TO allotted-resource( service-instance org.onap.relationships.inventory.Uses allotted-resource, MANY2MANY)
-      - TO configuration( service-instance org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - TO connector( service-instance org.onap.relationships.inventory.Uses connector, MANY2MANY)
-      - TO ctag-assignment( service-instance org.onap.relationships.inventory.Uses ctag-assignment, ONE2MANY)
-      - TO cvlan-tag( service-instance org.onap.relationships.inventory.ComposedOf cvlan-tag, MANY2MANY)
-      - TO instance-group( service-instance org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO logical-link( service-instance org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - TO pnf( service-instance org.onap.relationships.inventory.ComposedOf pnf, ONE2MANY)
-      - TO service-instance( service-instance org.onap.relationships.inventory.ComposedOf service-instance, ONE2MANY)
-      - TO vlan( service-instance org.onap.relationships.inventory.ComposedOf vlan, ONE2MANY)
-      - TO zone( service-instance org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - TO service-subscription( service-instance org.onap.relationships.inventory.BelongsTo service-subscription, MANY2ONE)
-      - TO vce( service-instance org.onap.relationships.inventory.ComposedOf vce, ONE2MANY)
-      - TO model-ver( service-instance org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM project( project org.onap.relationships.inventory.Uses service-instance, ONE2MANY)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
-      - FROM forwarding-path( forwarding-path org.onap.relationships.inventory.AppliesTo service-instance, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf service-instance, ONE2MANY)
-      - SERVICE-INSTANCE is DELETED when these are DELETED ALLOTTED-RESOURCE,METADATUM,FORWARDING-PATH
-      - SERVICE-INSTANCE deletion means associated objects of these types are also DELETED:LOGICAL-LINK
+      - TO generic-vnf( service-instance ComposedOf generic-vnf, ONE2MANY)
+      - TO l3-network( service-instance ComposedOf l3-network, ONE2MANY)
+      - TO owning-entity( service-instance BelongsTo owning-entity, MANY2ONE)
+      - TO allotted-resource( service-instance Uses allotted-resource, MANY2MANY)
+      - TO configuration( service-instance Uses configuration, ONE2MANY)
+      - TO connector( service-instance Uses connector, MANY2MANY)
+      - TO ctag-assignment( service-instance Uses ctag-assignment, ONE2MANY)
+      - TO cvlan-tag( service-instance ComposedOf cvlan-tag, MANY2MANY)
+      - TO instance-group( service-instance MemberOf instance-group, MANY2MANY)
+      - TO logical-link( service-instance Uses logical-link, ONE2MANY)(2)
+      - TO pnf( service-instance ComposedOf pnf, ONE2MANY)
+      - TO service-instance( service-instance ComposedOf service-instance, ONE2MANY)
+      - TO vlan( service-instance ComposedOf vlan, ONE2MANY)
+      - TO zone( service-instance LocatedIn zone, MANY2ONE)
+      - TO service-subscription( service-instance BelongsTo service-subscription, MANY2ONE)(4)
+      - TO vce( service-instance ComposedOf vce, ONE2MANY)
+      - TO model-ver( service-instance IsA model-ver, Many2One)
+      - FROM project( project Uses service-instance, ONE2MANY)
+      - FROM allotted-resource( allotted-resource BelongsTo service-instance, MANY2ONE)(1)
+      - FROM metadatum( metadatum BelongsTo service-instance, MANY2ONE)(1)
+      - FROM forwarding-path( forwarding-path AppliesTo service-instance, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf service-instance, ONE2MANY)
+
+      -(1) IF this SERVICE-INSTANCE node is deleted, this FROM node is DELETED also
+      -(2) IF this SERVICE-INSTANCE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this SERVICE-INSTANCE is DELETED also
     required:
     - service-instance-id
-    - service-type
-    - service-role
-    - created-at
-    - updated-at
-    - description
     properties:
       service-instance-id:
         type: string
@@ -57585,10 +51217,12 @@ definitions:
     description: |
       Object that group service instances.
       ###### Related Nodes
-      - TO customer( service-subscription org.onap.relationships.inventory.BelongsTo customer, MANY2ONE)
-      - TO tenant( service-subscription org.onap.relationships.inventory.Uses tenant, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.BelongsTo service-subscription, MANY2ONE)
-      - SERVICE-SUBSCRIPTION is DELETED when these are DELETED SERVICE-INSTANCE
+      - TO customer( service-subscription BelongsTo customer, MANY2ONE)(4)
+      - TO tenant( service-subscription Uses tenant, MANY2MANY)
+      - FROM service-instance( service-instance BelongsTo service-subscription, MANY2ONE)(1)
+
+      -(1) IF this SERVICE-SUBSCRIPTION node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this SERVICE-SUBSCRIPTION is DELETED also
     required:
     - service-type
     properties:
@@ -57628,9 +51262,11 @@ definitions:
   site-pair:
     description: |
       ###### Related Nodes
-      - TO routing-instance( site-pair org.onap.relationships.inventory.BelongsTo routing-instance, MANY2ONE)
-      - FROM class-of-service( class-of-service org.onap.relationships.inventory.BelongsTo site-pair, MANY2ONE)
-      - SITE-PAIR is DELETED when these are DELETED CLASS-OF-SERVICE
+      - TO routing-instance( site-pair BelongsTo routing-instance, MANY2ONE)(4)
+      - FROM class-of-service( class-of-service BelongsTo site-pair, MANY2ONE)(1)
+
+      -(1) IF this SITE-PAIR node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this SITE-PAIR is DELETED also
     required:
     - site-pair-id
     properties:
@@ -57667,9 +51303,10 @@ definitions:
     description: |
       Set of instances for probes used to measure service level agreements
       ###### Related Nodes
-      - TO generic-vnf( site-pair-set org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
-      - FROM routing-instance( routing-instance org.onap.relationships.inventory.BelongsTo site-pair-set, MANY2ONE)
-      - SITE-PAIR-SET is DELETED when these are DELETED ROUTING-INSTANCE
+      - TO generic-vnf( site-pair-set AppliesTo generic-vnf, MANY2MANY)
+      - FROM routing-instance( routing-instance BelongsTo site-pair-set, MANY2ONE)(1)
+
+      -(1) IF this SITE-PAIR-SET node is deleted, this FROM node is DELETED also
     required:
     - site-pair-set-id
     properties:
@@ -57707,8 +51344,9 @@ definitions:
     description: |
       Openstack snapshot
       ###### Related Nodes
-      - TO cloud-region( snapshot org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vserver( vserver org.onap.relationships.inventory.Uses snapshot, ONE2ONE)
+      - TO cloud-region( snapshot BelongsTo cloud-region, MANY2ONE)
+      - FROM vserver( vserver Uses snapshot, ONE2ONE)
+
     required:
     - snapshot-id
     properties:
@@ -57761,8 +51399,10 @@ definitions:
     description: |
       SR-IOV Physical Function
       ###### Related Nodes
-      - TO p-interface( sriov-pf org.onap.relationships.inventory.BelongsTo p-interface, ONE2ONE)
-      - FROM sriov-vf( sriov-vf org.onap.relationships.inventory.Uses sriov-pf, MANY2ONE)
+      - TO p-interface( sriov-pf BelongsTo p-interface, ONE2ONE)(4)
+      - FROM sriov-vf( sriov-vf Uses sriov-pf, MANY2ONE)
+
+      -(4) IF this TO node is deleted, this SRIOV-PF is DELETED also
     required:
     - pf-pci-id
     properties:
@@ -57788,8 +51428,10 @@ definitions:
     description: |
       SR-IOV Virtual Function (not to be confused with virtual network function)
       ###### Related Nodes
-      - TO l-interface( sriov-vf org.onap.relationships.inventory.BelongsTo l-interface, ONE2ONE)
-      - TO sriov-pf( sriov-vf org.onap.relationships.inventory.Uses sriov-pf, MANY2ONE)
+      - TO l-interface( sriov-vf BelongsTo l-interface, ONE2ONE)(4)
+      - TO sriov-pf( sriov-vf Uses sriov-pf, MANY2ONE)
+
+      -(4) IF this TO node is deleted, this SRIOV-VF is DELETED also
     required:
     - pci-id
     properties:
@@ -57856,14 +51498,17 @@ definitions:
   subnet:
     description: |
       ###### Related Nodes
-      - TO l3-network( subnet org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - FROM host-route( host-route org.onap.relationships.inventory.BelongsTo subnet, MANY2ONE)
-      - FROM vip-ipv4-address-list( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - FROM vip-ipv6-address-list( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - SUBNET cannot be deleted if linked to L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST
-      - SUBNET is DELETED when these are DELETED HOST-ROUTE
+      - TO l3-network( subnet BelongsTo l3-network, MANY2ONE)(4)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list MemberOf subnet, MANY2MANY)
+      - FROM host-route( host-route BelongsTo subnet, MANY2ONE)(1)
+      - FROM vip-ipv4-address-list( vip-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - FROM vip-ipv6-address-list( vip-ipv6-address-list MemberOf subnet, MANY2MANY)
+
+      -(1) IF this SUBNET node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this SUBNET is DELETED also
+      -SUBNET cannot be deleted if related to L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST
+
     required:
     - subnet-id
     - dhcp-enabled
@@ -57894,6 +51539,7 @@ definitions:
         description: Orchestration status of this VNF, mastered by MSO
       dhcp-enabled:
         type: boolean
+        description: dhcp enabled
       dhcp-start:
         type: string
         description: the start address reserved for use by dhcp
@@ -57937,13 +51583,15 @@ definitions:
     description: |
       Openstack tenant
       ###### Related Nodes
-      - TO cloud-region( tenant org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO group-assignment( tenant org.onap.relationships.inventory.MemberOf group-assignment, MANY2MANY)
-      - TO l3-network( tenant org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - TO volume-group( tenant org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
-      - FROM service-subscription( service-subscription org.onap.relationships.inventory.Uses tenant, MANY2MANY)
-      - FROM vserver( vserver org.onap.relationships.inventory.BelongsTo tenant, MANY2ONE)
-      - TENANT cannot be deleted if linked to VSERVER
+      - TO cloud-region( tenant BelongsTo cloud-region, MANY2ONE)
+      - TO group-assignment( tenant MemberOf group-assignment, MANY2MANY)
+      - TO l3-network( tenant Uses l3-network, MANY2MANY)
+      - TO volume-group( tenant DependsOn volume-group, ONE2MANY)
+      - FROM service-subscription( service-subscription Uses tenant, MANY2MANY)
+      - FROM vserver( vserver BelongsTo tenant, MANY2ONE)
+
+      -TENANT cannot be deleted if related to VSERVER
+
     required:
     - tenant-id
     - tenant-name
@@ -57980,7 +51628,9 @@ definitions:
     description: |
       Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted
       ###### Related Nodes
-      - TO allotted-resource( tunnel-xconnect org.onap.relationships.inventory.BelongsTo allotted-resource, ONE2ONE)
+      - TO allotted-resource( tunnel-xconnect BelongsTo allotted-resource, ONE2ONE)(4)
+
+      -(4) IF this TO node is deleted, this TUNNEL-XCONNECT is DELETED also
     required:
     - id
     properties:
@@ -58042,14 +51692,15 @@ definitions:
     description: |
       Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.
       ###### Related Nodes
-      - TO availability-zone( vce org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - TO complex( vce org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - TO vserver( vce tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM entitlement( entitlement org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM license( license org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM port-group( port-group org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf vce, ONE2MANY)
-      - VCE is DELETED when these are DELETED ENTITLEMENT,LICENSE,PORT-GROUP
+      - TO availability-zone( vce Uses availability-zone, MANY2MANY)
+      - TO complex( vce LocatedIn complex, MANY2MANY)
+      - TO vserver( vce HostedOn vserver, ONE2MANY)
+      - FROM entitlement( entitlement BelongsTo vce, MANY2ONE)(1)
+      - FROM license( license BelongsTo vce, MANY2ONE)(1)
+      - FROM port-group( port-group BelongsTo vce, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf vce, ONE2MANY)
+
+      -(1) IF this VCE node is deleted, this FROM node is DELETED also
     required:
     - vnf-id
     - vnf-name
@@ -58140,13 +51791,16 @@ definitions:
     description: |
       a deployment unit of VNFCs
       ###### Related Nodes
-      - TO generic-vnf( vf-module org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO l3-network( vf-module org.onap.relationships.inventory.DependsOn l3-network, MANY2MANY)
-      - TO vnfc( vf-module org.onap.relationships.inventory.Uses vnfc, ONE2MANY)
-      - TO volume-group( vf-module org.onap.relationships.inventory.Uses volume-group, ONE2ONE)
-      - TO vserver( vf-module org.onap.relationships.inventory.Uses vserver, ONE2MANY)
-      - TO model-ver( vf-module org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - VF-MODULE cannot be deleted if linked to VNFC
+      - TO generic-vnf( vf-module BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO l3-network( vf-module DependsOn l3-network, MANY2MANY)
+      - TO vnfc( vf-module Uses vnfc, ONE2MANY)
+      - TO volume-group( vf-module Uses volume-group, ONE2ONE)
+      - TO vserver( vf-module Uses vserver, ONE2MANY)
+      - TO model-ver( vf-module IsA model-ver, Many2One)
+
+      -(4) IF this TO node is deleted, this VF-MODULE is DELETED also
+      -VF-MODULE cannot be deleted if related to VNFC
+
     required:
     - vf-module-id
     - is-base-vf-module
@@ -58165,6 +51819,7 @@ definitions:
         description: orchestration status of this vf-module, mastered by MSO
       is-base-vf-module:
         type: boolean
+        description: used to indicate whether or not this object is base vf module
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -58212,7 +51867,9 @@ definitions:
     description: |
       vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607
       ###### Related Nodes
-      - TO ipsec-configuration( vig-server org.onap.relationships.inventory.BelongsTo ipsec-configuration, MANY2ONE)
+      - TO ipsec-configuration( vig-server BelongsTo ipsec-configuration, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this VIG-SERVER is DELETED also
     required:
     - vig-address-type
     properties:
@@ -58242,10 +51899,11 @@ definitions:
     description: |
       IPv4 Address Range
       ###### Related Nodes
-      - TO cloud-region( vip-ipv4-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO instance-group( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO subnet( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.Uses vip-ipv4-address-list, MANY2MANY)
+      - TO cloud-region( vip-ipv4-address-list BelongsTo cloud-region, MANY2ONE)
+      - TO instance-group( vip-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - TO subnet( vip-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - FROM vnfc( vnfc Uses vip-ipv4-address-list, MANY2MANY)
+
     required:
     - vip-ipv4-address
     properties:
@@ -58284,10 +51942,11 @@ definitions:
     description: |
       IPv6 Address Range
       ###### Related Nodes
-      - TO cloud-region( vip-ipv6-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO instance-group( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO subnet( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.Uses vip-ipv6-address-list, MANY2MANY)
+      - TO cloud-region( vip-ipv6-address-list BelongsTo cloud-region, MANY2ONE)
+      - TO instance-group( vip-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - TO subnet( vip-ipv6-address-list MemberOf subnet, MANY2MANY)
+      - FROM vnfc( vnfc Uses vip-ipv6-address-list, MANY2MANY)
+
     required:
     - vip-ipv6-address
     properties:
@@ -58326,9 +51985,10 @@ definitions:
     description: |
       Virtual organization of cloud infrastructure elements in a data center context
       ###### Related Nodes
-      - FROM connector( connector org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
+      - FROM connector( connector LocatedIn virtual-data-center, MANY2MANY)
+      - FROM generic-vnf( generic-vnf LocatedIn virtual-data-center, MANY2MANY)
+      - FROM logical-link( logical-link LocatedIn virtual-data-center, MANY2MANY)
+
     required:
     - vdc-id
     - vdc-name
@@ -58358,15 +52018,17 @@ definitions:
     description: |
       Definition of vlan
       ###### Related Nodes
-      - TO l-interface( vlan tosca.relationships.network.LinksTo l-interface, MANY2ONE)
-      - TO logical-link( vlan org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - TO multicast-configuration( vlan org.onap.relationships.inventory.Uses multicast-configuration, MANY2MANY)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.PartOf vlan, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf vlan, ONE2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - VLAN is DELETED when these are DELETED L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST
-      - VLAN deletion means associated objects of these types are also DELETED:LOGICAL-LINK
+      - TO l-interface( vlan LinksTo l-interface, MANY2ONE)(4)
+      - TO logical-link( vlan Uses logical-link, MANY2MANY)(2)
+      - TO multicast-configuration( vlan Uses multicast-configuration, MANY2MANY)
+      - FROM allotted-resource( allotted-resource PartOf vlan, MANY2MANY)
+      - FROM service-instance( service-instance ComposedOf vlan, ONE2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list BelongsTo vlan, MANY2ONE)(1)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list BelongsTo vlan, MANY2ONE)(1)
+
+      -(1) IF this VLAN node is deleted, this FROM node is DELETED also
+      -(2) IF this VLAN node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this VLAN is DELETED also
     required:
     - vlan-interface
     - in-maint
@@ -58406,11 +52068,13 @@ definitions:
         description: Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       prov-status:
         type: string
         description: Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV].
       is-ip-unnumbered:
         type: boolean
+        description: Flag indicating the interface uses the IP Unnumbered configuration.
       relationship-list:
         type: array
         items:
@@ -58442,8 +52106,10 @@ definitions:
     description: |
       Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.
       ###### Related Nodes
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses vnf-image, MANY2ONE)
-      - VNF-IMAGE cannot be deleted if linked to GENERIC-VNF
+      - FROM generic-vnf( generic-vnf Uses vnf-image, MANY2ONE)
+
+      -VNF-IMAGE cannot be deleted if related to GENERIC-VNF
+
     required:
     - vnf-image-uuid
     - application
@@ -58482,15 +52148,17 @@ definitions:
   vnfc:
     description: |
       ###### Related Nodes
-      - TO generic-vnf( vnfc org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO instance-group( vnfc org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO vip-ipv4-address-list( vnfc org.onap.relationships.inventory.Uses vip-ipv4-address-list, MANY2MANY)
-      - TO vip-ipv6-address-list( vnfc org.onap.relationships.inventory.Uses vip-ipv6-address-list, MANY2MANY)
-      - TO vserver( vnfc tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.Uses vnfc, ONE2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
-      - VNFC is DELETED when these are DELETED L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST
+      - TO generic-vnf( vnfc BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO instance-group( vnfc MemberOf instance-group, MANY2MANY)
+      - TO vip-ipv4-address-list( vnfc Uses vip-ipv4-address-list, MANY2MANY)
+      - TO vip-ipv6-address-list( vnfc Uses vip-ipv6-address-list, MANY2MANY)
+      - TO vserver( vnfc HostedOn vserver, ONE2MANY)
+      - FROM vf-module( vf-module Uses vnfc, ONE2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list BelongsTo vnfc, MANY2ONE)(1)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list BelongsTo vnfc, MANY2ONE)(1)
+
+      -(1) IF this VNFC node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this VNFC is DELETED also
     required:
     - vnfc-name
     - nfc-naming-code
@@ -58518,8 +52186,10 @@ definitions:
         description: Oam V4 vip address of this vnfc
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       is-closed-loop-disabled:
         type: boolean
+        description: used to indicate whether closed loop function is enabled on this node
       group-notation:
         type: string
         description: Group notation of VNFC
@@ -58556,7 +52226,9 @@ definitions:
     description: |
       Ephemeral Block storage volume.
       ###### Related Nodes
-      - FROM vserver (PARENT of volume, vserver tosca.relationships.AttachesTo volume)
+      - FROM vserver (PARENT of volume, vserver AttachesTo volume)(3)
+
+      -(3) IF this FROM node is deleted, this VOLUME is DELETED also
     required:
     - volume-id
     - volume-selflink
@@ -58578,11 +52250,12 @@ definitions:
     description: |
       Persistent block-level storage.
       ###### Related Nodes
-      - TO cloud-region( volume-group org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO complex( volume-group org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.Uses volume-group, ONE2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
+      - TO cloud-region( volume-group BelongsTo cloud-region, MANY2ONE)
+      - TO complex( volume-group LocatedIn complex, MANY2ONE)
+      - FROM generic-vnf( generic-vnf DependsOn volume-group, ONE2MANY)
+      - FROM vf-module( vf-module Uses volume-group, ONE2ONE)
+      - FROM tenant( tenant DependsOn volume-group, ONE2MANY)
+
     required:
     - volume-group-id
     - volume-group-name
@@ -58636,11 +52309,12 @@ definitions:
     description: |
       VPLS Provider Edge routers.
       ###### Related Nodes
-      - TO complex( vpls-pe org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO ctag-pool( vpls-pe org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
-      - FROM lag-interface( lag-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - FROM p-interface( p-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - VPLS-PE is DELETED when these are DELETED LAG-INTERFACE,P-INTERFACE
+      - TO complex( vpls-pe LocatedIn complex, MANY2ONE)
+      - TO ctag-pool( vpls-pe Uses ctag-pool, MANY2MANY)
+      - FROM lag-interface( lag-interface BindsTo vpls-pe, MANY2ONE)(1)
+      - FROM p-interface( p-interface BindsTo vpls-pe, MANY2ONE)(1)
+
+      -(1) IF this VPLS-PE node is deleted, this FROM node is DELETED also
     required:
     - equipment-name
     properties:
@@ -58686,12 +52360,14 @@ definitions:
     description: |
       VPN binding
       ###### Related Nodes
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2MANY)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - FROM route-target( route-target org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2ONE)
-      - VPN-BINDING cannot be deleted if linked to ALLOTTED-RESOURCE,L3-NETWORK,LOGICAL-LINK
-      - VPN-BINDING is DELETED when these are DELETED ROUTE-TARGET
+      - FROM allotted-resource( allotted-resource BelongsTo vpn-binding, MANY2MANY)
+      - FROM l3-network( l3-network Uses vpn-binding, MANY2MANY)
+      - FROM logical-link( logical-link Uses vpn-binding, MANY2MANY)
+      - FROM route-target( route-target BelongsTo vpn-binding, MANY2ONE)(1)
+
+      -(1) IF this VPN-BINDING node is deleted, this FROM node is DELETED also
+      -VPN-BINDING cannot be deleted if related to ALLOTTED-RESOURCE,L3-NETWORK,LOGICAL-LINK
+
     required:
     - vpn-id
     - vpn-name
@@ -58739,19 +52415,20 @@ definitions:
     description: |
       Virtual Servers, aka virtual machine or VM.
       ###### Related Nodes
-      - TO tenant( vserver org.onap.relationships.inventory.BelongsTo tenant, MANY2ONE)
-      - TO flavor( vserver org.onap.relationships.inventory.Uses flavor, MANY2ONE)
-      - TO image( vserver org.onap.relationships.inventory.Uses image, MANY2ONE)
-      - TO pserver( vserver tosca.relationships.HostedOn pserver, MANY2ONE)
-      - TO snapshot( vserver org.onap.relationships.inventory.Uses snapshot, ONE2ONE)
-      - TO volume (CHILD of vserver, vserver tosca.relationships.AttachesTo volume, ONE2MANY)
-      - FROM generic-vnf( generic-vnf tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM vce( vce tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM l-interface( l-interface tosca.relationships.network.BindsTo vserver, MANY2ONE)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.Uses vserver, ONE2MANY)
-      - FROM vnfc( vnfc tosca.relationships.HostedOn vserver, ONE2MANY)
-      - VSERVER is DELETED when these are DELETED L-INTERFACE
-      - VSERVER deletion means associated objects of these types are also DELETED:VOLUME
+      - TO tenant( vserver BelongsTo tenant, MANY2ONE)
+      - TO flavor( vserver Uses flavor, MANY2ONE)
+      - TO image( vserver Uses image, MANY2ONE)
+      - TO pserver( vserver HostedOn pserver, MANY2ONE)
+      - TO snapshot( vserver Uses snapshot, ONE2ONE)
+      - TO volume (CHILD of vserver, vserver AttachesTo volume, ONE2MANY)(2)
+      - FROM generic-vnf( generic-vnf HostedOn vserver, ONE2MANY)
+      - FROM vce( vce HostedOn vserver, ONE2MANY)
+      - FROM l-interface( l-interface BindsTo vserver, MANY2ONE)(1)
+      - FROM vf-module( vf-module Uses vserver, ONE2MANY)
+      - FROM vnfc( vnfc HostedOn vserver, ONE2MANY)
+
+      -(1) IF this VSERVER node is deleted, this FROM node is DELETED also
+      -(2) IF this VSERVER node is deleted, this TO node is DELETED also
     required:
     - vserver-id
     - vserver-name
@@ -58776,8 +52453,10 @@ definitions:
         description: URL to endpoint where AAI can get more details
       in-maint:
         type: boolean
+        description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       is-closed-loop-disabled:
         type: boolean
+        description: Used to indicate whether closed loop function is enabled on this node
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -58805,11 +52484,12 @@ definitions:
     description: |
       A zone is a grouping of assets in a location homing to the same connections into the CBB
       ###### Related Nodes
-      - TO complex( zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM cloud-region( cloud-region org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM pnf( pnf org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM pserver( pserver org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
+      - TO complex( zone LocatedIn complex, MANY2ONE)
+      - FROM cloud-region( cloud-region LocatedIn zone, MANY2ONE)
+      - FROM pnf( pnf LocatedIn zone, MANY2ONE)
+      - FROM pserver( pserver LocatedIn zone, MANY2ONE)
+      - FROM service-instance( service-instance LocatedIn zone, MANY2ONE)
+
     required:
     - zone-id
     - zone-name
@@ -58847,12 +52527,6 @@ definitions:
         items:          
           $ref: "#/definitions/zone"
 patchDefinitions:
-  aai-internal:
-    properties:
-      property-name:
-        type: string
-      property-value:
-        type: string
   action:
     properties:
       action-type:
@@ -58881,21 +52555,24 @@ patchDefinitions:
     description: |
       Represents a slice or partial piece of a resource that gets separately allotted
       ###### Related Nodes
-      - TO allotted-resource( allotted-resource tosca.relationships.network.BindsTo allotted-resource, ONE2ONE)
-      - TO generic-vnf( allotted-resource org.onap.relationships.inventory.PartOf generic-vnf, MANY2MANY)
-      - TO instance-group( allotted-resource org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO l3-network( allotted-resource org.onap.relationships.inventory.PartOf l3-network, MANY2MANY)
-      - TO l-interface( allotted-resource org.onap.relationships.inventory.Uses l-interface, ONE2MANY)
-      - TO network-policy( allotted-resource org.onap.relationships.inventory.Uses network-policy, ONE2ONE)
-      - TO vlan( allotted-resource org.onap.relationships.inventory.PartOf vlan, MANY2MANY)
-      - TO vpn-binding( allotted-resource org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2MANY)
-      - TO service-instance( allotted-resource org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
-      - TO model-ver( allotted-resource org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM tunnel-xconnect( tunnel-xconnect org.onap.relationships.inventory.BelongsTo allotted-resource, ONE2ONE)
-      - FROM configuration( configuration org.onap.relationships.inventory.Uses allotted-resource, ONE2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses allotted-resource, MANY2MANY)
-      - FROM allotted-resource( allotted-resource tosca.relationships.network.BindsTo allotted-resource, ONE2ONE)
-      - ALLOTTED-RESOURCE is DELETED when these are DELETED TUNNEL-XCONNECT
+      - TO allotted-resource( allotted-resource BindsTo allotted-resource, ONE2ONE)
+      - TO generic-vnf( allotted-resource PartOf generic-vnf, MANY2MANY)
+      - TO instance-group( allotted-resource MemberOf instance-group, MANY2MANY)
+      - TO l3-network( allotted-resource PartOf l3-network, MANY2MANY)
+      - TO l-interface( allotted-resource Uses l-interface, ONE2MANY)
+      - TO network-policy( allotted-resource Uses network-policy, ONE2ONE)
+      - TO vlan( allotted-resource PartOf vlan, MANY2MANY)
+      - TO vpn-binding( allotted-resource BelongsTo vpn-binding, MANY2MANY)
+      - TO service-instance( allotted-resource BelongsTo service-instance, MANY2ONE)(4)
+      - TO model-ver( allotted-resource IsA model-ver, Many2One)
+      - FROM tunnel-xconnect( tunnel-xconnect BelongsTo allotted-resource, ONE2ONE)(1)
+      - FROM configuration( configuration Uses allotted-resource, ONE2ONE)(3)
+      - FROM service-instance( service-instance Uses allotted-resource, MANY2MANY)
+      - FROM allotted-resource( allotted-resource BindsTo allotted-resource, ONE2ONE)
+
+      -(1) IF this ALLOTTED-RESOURCE node is deleted, this FROM node is DELETED also
+      -(3) IF this FROM node is deleted, this ALLOTTED-RESOURCE is DELETED also
+      -(4) IF this TO node is deleted, this ALLOTTED-RESOURCE is DELETED also
     required:
     - id
     properties:
@@ -58929,15 +52606,18 @@ patchDefinitions:
     description: |
       Availability zone, a collection of compute hosts/pservers
       ###### Related Nodes
-      - TO complex( availability-zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO service-capability( availability-zone org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
-      - TO cloud-region( availability-zone org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM ctag-pool( ctag-pool org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
-      - FROM dvs-switch( dvs-switch org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - FROM pserver( pserver org.onap.relationships.inventory.MemberOf availability-zone, MANY2ONE)
-      - FROM vce( vce org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - AVAILABILITY-ZONE cannot be deleted if linked to CTAG-POOL,DVS-SWITCH,GENERIC-VNF,PSERVER,VCE
+      - TO complex( availability-zone LocatedIn complex, MANY2ONE)
+      - TO service-capability( availability-zone AppliesTo service-capability, MANY2MANY)
+      - TO cloud-region( availability-zone BelongsTo cloud-region, MANY2ONE)(4)
+      - FROM ctag-pool( ctag-pool AppliesTo availability-zone, MANY2MANY)
+      - FROM dvs-switch( dvs-switch AppliesTo availability-zone, MANY2MANY)
+      - FROM generic-vnf( generic-vnf Uses availability-zone, MANY2MANY)
+      - FROM pserver( pserver MemberOf availability-zone, MANY2ONE)
+      - FROM vce( vce Uses availability-zone, MANY2MANY)
+
+      -(4) IF this TO node is deleted, this AVAILABILITY-ZONE is DELETED also
+      -AVAILABILITY-ZONE cannot be deleted if related to CTAG-POOL,DVS-SWITCH,GENERIC-VNF,PSERVER,VCE
+
     required:
     - availability-zone-name
     - hypervisor-type
@@ -58998,7 +52678,9 @@ patchDefinitions:
   class-of-service:
     description: |
       ###### Related Nodes
-      - TO site-pair( class-of-service org.onap.relationships.inventory.BelongsTo site-pair, MANY2ONE)
+      - TO site-pair( class-of-service BelongsTo site-pair, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this CLASS-OF-SERVICE is DELETED also
     required:
     - cos
     properties:
@@ -59051,26 +52733,28 @@ patchDefinitions:
     description: |
       cloud-region designates an installation of a cloud cluster or region or instantiation.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of cloud-region, cloud-region has esr-system-info, One2Many)
-      - TO complex( cloud-region org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO l3-network( cloud-region org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - TO zone( cloud-region org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM availability-zone( availability-zone org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM dvs-switch( dvs-switch org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM flavor( flavor org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM group-assignment( group-assignment org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM image( image org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM oam-network( oam-network org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM snapshot( snapshot org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vip-ipv4-address-list( vip-ipv4-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vip-ipv6-address-list( vip-ipv6-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM volume-group( volume-group org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.LocatedIn cloud-region, MANY2MANY)
-      - FROM pserver( pserver org.onap.relationships.inventory.LocatedIn cloud-region, MANY2ONE)
-      - CLOUD-REGION cannot be deleted if linked to DVS-SWITCH,FLAVOR,GROUP-ASSIGNMENT,IMAGE,OAM-NETWORK,SNAPSHOT,TENANT,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST,VOLUME-GROUP
-      - CLOUD-REGION is DELETED when these are DELETED AVAILABILITY-ZONE
-      - CLOUD-REGION deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - TO complex( cloud-region LocatedIn complex, MANY2ONE)
+      - TO l3-network( cloud-region Uses l3-network, MANY2MANY)
+      - TO zone( cloud-region LocatedIn zone, MANY2ONE)
+      - FROM esr-system-info( esr-system-info BelongsTo cloud-region, MANY2ONE)(1)
+      - FROM availability-zone( availability-zone BelongsTo cloud-region, MANY2ONE)(1)
+      - FROM dvs-switch( dvs-switch BelongsTo cloud-region, MANY2ONE)
+      - FROM flavor( flavor BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-capability( hpa-capability BelongsTo cloud-region, MANY2ONE)
+      - FROM group-assignment( group-assignment BelongsTo cloud-region, MANY2ONE)
+      - FROM image( image BelongsTo cloud-region, MANY2ONE)
+      - FROM oam-network( oam-network BelongsTo cloud-region, MANY2ONE)
+      - FROM snapshot( snapshot BelongsTo cloud-region, MANY2ONE)
+      - FROM tenant( tenant BelongsTo cloud-region, MANY2ONE)
+      - FROM vip-ipv4-address-list( vip-ipv4-address-list BelongsTo cloud-region, MANY2ONE)
+      - FROM vip-ipv6-address-list( vip-ipv6-address-list BelongsTo cloud-region, MANY2ONE)
+      - FROM volume-group( volume-group BelongsTo cloud-region, MANY2ONE)
+      - FROM logical-link( logical-link LocatedIn cloud-region, MANY2MANY)
+      - FROM pserver( pserver LocatedIn cloud-region, MANY2ONE)
+
+      -(1) IF this CLOUD-REGION node is deleted, this FROM node is DELETED also
+      -CLOUD-REGION cannot be deleted if related to DVS-SWITCH,FLAVOR,HPA-CAPABILITY,GROUP-ASSIGNMENT,IMAGE,OAM-NETWORK,SNAPSHOT,TENANT,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST,VOLUME-GROUP
+
     required:
     - cloud-owner
     - cloud-region-id
@@ -59102,6 +52786,7 @@ patchDefinitions:
         description: complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.
       sriov-automation:
         type: boolean
+        description: Whether the cloud region supports (true) or does not support (false) SR-IOV automation.
       cloud-extra-info:
         type: string
         description: ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM.
@@ -59118,20 +52803,22 @@ patchDefinitions:
     description: |
       Collection of physical locations that can house cloud-regions.
       ###### Related Nodes
-      - TO l3-network( complex org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM availability-zone( availability-zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM cloud-region( cloud-region org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM ctag-pool( ctag-pool org.onap.relationships.inventory.BelongsTo complex, MANY2ONE)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - FROM oam-network( oam-network org.onap.relationships.inventory.AppliesTo complex, MANY2MANY)
-      - FROM pnf( pnf org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM pserver( pserver org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM vce( vce org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - FROM volume-group( volume-group org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM vpls-pe( vpls-pe org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM zone( zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - COMPLEX cannot be deleted if linked to AVAILABILITY-ZONE,CLOUD-REGION,GENERIC-VNF,OAM-NETWORK,PNF,PSERVER,VCE,VOLUME-GROUP,VPLS-PE,ZONE
-      - COMPLEX is DELETED when these are DELETED CTAG-POOL
+      - TO l3-network( complex Uses l3-network, MANY2MANY)
+      - FROM availability-zone( availability-zone LocatedIn complex, MANY2ONE)
+      - FROM cloud-region( cloud-region LocatedIn complex, MANY2ONE)
+      - FROM ctag-pool( ctag-pool BelongsTo complex, MANY2ONE)(1)
+      - FROM generic-vnf( generic-vnf LocatedIn complex, MANY2MANY)
+      - FROM oam-network( oam-network AppliesTo complex, MANY2MANY)
+      - FROM pnf( pnf LocatedIn complex, MANY2ONE)
+      - FROM pserver( pserver LocatedIn complex, MANY2ONE)
+      - FROM vce( vce LocatedIn complex, MANY2MANY)
+      - FROM volume-group( volume-group LocatedIn complex, MANY2ONE)
+      - FROM vpls-pe( vpls-pe LocatedIn complex, MANY2ONE)
+      - FROM zone( zone LocatedIn complex, MANY2ONE)
+
+      -(1) IF this COMPLEX node is deleted, this FROM node is DELETED also
+      -COMPLEX cannot be deleted if related to AVAILABILITY-ZONE,CLOUD-REGION,GENERIC-VNF,OAM-NETWORK,PNF,PSERVER,VCE,VOLUME-GROUP,VPLS-PE,ZONE
+
     required:
     - physical-location-id
     - physical-location-type
@@ -59165,19 +52852,21 @@ patchDefinitions:
     description: |
       Port Mirror Configuration.
       ###### Related Nodes
-      - TO allotted-resource( configuration org.onap.relationships.inventory.Uses allotted-resource, ONE2ONE)
-      - TO logical-link( configuration org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - TO l-interface( configuration org.onap.relationships.inventory.AppliesTo l-interface, ONE2MANY)
-      - TO pnf( configuration org.onap.relationships.inventory.AppliesTo pnf, ONE2MANY)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo configuration, MANY2ONE)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - FROM forwarding-path( forwarding-path org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - FROM evc( evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
-      - FROM forwarder-evc( forwarder-evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
-      - CONFIGURATION is DELETED when these are DELETED METADATUM,EVC,FORWARDER-EVC
-      - CONFIGURATION deletion means associated objects of these types are also DELETED:ALLOTTED-RESOURCE,LOGICAL-LINK
+      - TO allotted-resource( configuration Uses allotted-resource, ONE2ONE)(2)
+      - TO logical-link( configuration Uses logical-link, ONE2MANY)(2)
+      - TO l-interface( configuration AppliesTo l-interface, ONE2MANY)
+      - TO pnf( configuration AppliesTo pnf, ONE2MANY)
+      - FROM metadatum( metadatum BelongsTo configuration, MANY2ONE)(1)
+      - FROM generic-vnf( generic-vnf Uses configuration, ONE2MANY)(3)
+      - FROM service-instance( service-instance Uses configuration, ONE2MANY)
+      - FROM forwarder( forwarder Uses configuration, ONE2ONE)(3)
+      - FROM forwarding-path( forwarding-path Uses configuration, ONE2ONE)(3)
+      - FROM evc( evc BelongsTo configuration, ONE2ONE)(1)
+      - FROM forwarder-evc( forwarder-evc BelongsTo configuration, ONE2ONE)(1)
+
+      -(1) IF this CONFIGURATION node is deleted, this FROM node is DELETED also
+      -(2) IF this CONFIGURATION node is deleted, this TO node is DELETED also
+      -(3) IF this FROM node is deleted, this CONFIGURATION is DELETED also
     required:
     - configuration-id
     - configuration-type
@@ -59238,10 +52927,11 @@ patchDefinitions:
     description: |
       Collection of resource instances used to connect a variety of disparate inventory widgets
       ###### Related Nodes
-      - TO virtual-data-center( connector org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo connector, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses connector, MANY2MANY)
-      - CONNECTOR is DELETED when these are DELETED METADATUM
+      - TO virtual-data-center( connector LocatedIn virtual-data-center, MANY2MANY)
+      - FROM metadatum( metadatum BelongsTo connector, MANY2ONE)(1)
+      - FROM service-instance( service-instance Uses connector, MANY2MANY)
+
+      -(1) IF this CONNECTOR node is deleted, this FROM node is DELETED also
     required:
     - resource-instance-id
     properties:
@@ -59260,10 +52950,12 @@ patchDefinitions:
     description: |
       This is how we would capture constraints defining allowed sets of elements.
       ###### Related Nodes
-      - TO model-constraint( constrained-element-set org.onap.relationships.inventory.BelongsTo model-constraint, MANY2ONE)
-      - TO model-element( constrained-element-set org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM element-choice-set( element-choice-set org.onap.relationships.inventory.BelongsTo constrained-element-set, MANY2ONE)
-      - CONSTRAINED-ELEMENT-SET is DELETED when these are DELETED ELEMENT-CHOICE-SET
+      - TO model-constraint( constrained-element-set BelongsTo model-constraint, MANY2ONE)(4)
+      - TO model-element( constrained-element-set BelongsTo model-element, MANY2ONE)(4)
+      - FROM element-choice-set( element-choice-set BelongsTo constrained-element-set, MANY2ONE)(1)
+
+      -(1) IF this CONSTRAINED-ELEMENT-SET node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this CONSTRAINED-ELEMENT-SET is DELETED also
     required:
     - constrained-element-set-uuid
     - constraint-type
@@ -59284,8 +52976,10 @@ patchDefinitions:
   ctag-assignment:
     description: |
       ###### Related Nodes
-      - TO l3-network( ctag-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses ctag-assignment, ONE2MANY)
+      - TO l3-network( ctag-assignment BelongsTo l3-network, MANY2ONE)(4)
+      - FROM service-instance( service-instance Uses ctag-assignment, ONE2MANY)
+
+      -(4) IF this TO node is deleted, this CTAG-ASSIGNMENT is DELETED also
     required:
     - vlan-id-inner
     properties:
@@ -59303,10 +52997,12 @@ patchDefinitions:
     description: |
       A collection of C tags (vlan tags) grouped for a specific purpose.
       ###### Related Nodes
-      - TO complex( ctag-pool org.onap.relationships.inventory.BelongsTo complex, MANY2ONE)
-      - TO availability-zone( ctag-pool org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
-      - FROM vpls-pe( vpls-pe org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
+      - TO complex( ctag-pool BelongsTo complex, MANY2ONE)(4)
+      - TO availability-zone( ctag-pool AppliesTo availability-zone, MANY2MANY)
+      - FROM generic-vnf( generic-vnf Uses ctag-pool, MANY2MANY)
+      - FROM vpls-pe( vpls-pe Uses ctag-pool, MANY2MANY)
+
+      -(4) IF this TO node is deleted, this CTAG-POOL is DELETED also
     required:
     - target-pe
     - availability-zone-name
@@ -59334,8 +53030,9 @@ patchDefinitions:
     description: |
       customer identifiers to provide linkage back to BSS information.
       ###### Related Nodes
-      - FROM service-subscription( service-subscription org.onap.relationships.inventory.BelongsTo customer, MANY2ONE)
-      - CUSTOMER is DELETED when these are DELETED SERVICE-SUBSCRIPTION
+      - FROM service-subscription( service-subscription BelongsTo customer, MANY2ONE)(1)
+
+      -(1) IF this CUSTOMER node is deleted, this FROM node is DELETED also
     required:
     - global-customer-id
     - subscriber-name
@@ -59376,8 +53073,9 @@ patchDefinitions:
     description: |
       Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&AI. 
       ###### Related Nodes
-      - TO cloud-region( dvs-switch org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO availability-zone( dvs-switch org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
+      - TO cloud-region( dvs-switch BelongsTo cloud-region, MANY2ONE)
+      - TO availability-zone( dvs-switch AppliesTo availability-zone, MANY2MANY)
+
     required:
     - switch-name
     - vcenter-url
@@ -59446,9 +53144,11 @@ patchDefinitions:
     description: |
       This is how we would capture constraints defining allowed sets of elements.
       ###### Related Nodes
-      - TO constrained-element-set( element-choice-set org.onap.relationships.inventory.BelongsTo constrained-element-set, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.BelongsTo element-choice-set, MANY2ONE)
-      - ELEMENT-CHOICE-SET is DELETED when these are DELETED MODEL-ELEMENT
+      - TO constrained-element-set( element-choice-set BelongsTo constrained-element-set, MANY2ONE)(4)
+      - FROM model-element( model-element BelongsTo element-choice-set, MANY2ONE)(1)
+
+      -(1) IF this ELEMENT-CHOICE-SET node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this ELEMENT-CHOICE-SET is DELETED also
     required:
     - element-choice-set-uuid
     - element-choice-set-name
@@ -59469,8 +53169,10 @@ patchDefinitions:
     description: |
       Metadata for entitlement group.
       ###### Related Nodes
-      - TO generic-vnf( entitlement org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO vce( entitlement org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
+      - TO generic-vnf( entitlement BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO vce( entitlement BelongsTo vce, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this ENTITLEMENT is DELETED also
     required:
     - group-uuid
     - resource-uuid
@@ -59493,8 +53195,9 @@ patchDefinitions:
     description: |
       Persist EMS address information used by EMS driver.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of esr-ems, esr-ems has esr-system-info, One2Many)
-      - ESR-EMS deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - FROM esr-system-info( esr-system-info BelongsTo esr-ems, MANY2ONE)(1)
+
+      -(1) IF this ESR-EMS node is deleted, this FROM node is DELETED also
     required:
     - ems-id
     properties:
@@ -59511,10 +53214,12 @@ patchDefinitions:
     description: |
       Persist common address information of external systems.
       ###### Related Nodes
-      - FROM esr-ems (PARENT of esr-system-info, esr-ems has esr-system-info)
-      - FROM esr-vnfm (PARENT of esr-system-info, esr-vnfm has esr-system-info)
-      - FROM esr-thirdparty-sdnc (PARENT of esr-system-info, esr-thirdparty-sdnc has esr-system-info)
-      - FROM cloud-region (PARENT of esr-system-info, cloud-region has esr-system-info)
+      - TO esr-ems( esr-system-info BelongsTo esr-ems, MANY2ONE)(4)
+      - TO esr-vnfm( esr-system-info BelongsTo esr-vnfm, ONE2ONE)(4)
+      - TO esr-thirdparty-sdnc( esr-system-info BelongsTo esr-thirdparty-sdnc, ONE2ONE)(4)
+      - TO cloud-region( esr-system-info BelongsTo cloud-region, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this ESR-SYSTEM-INFO is DELETED also
     required:
     - esr-system-info-id
     - user-name
@@ -59590,9 +53295,10 @@ patchDefinitions:
     description: |
       Persist SDNC address information used by ONAP SDNC.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of esr-thirdparty-sdnc, esr-thirdparty-sdnc has esr-system-info, One2One)
-      - TO pnf( esr-thirdparty-sdnc has pnf, One2Many)
-      - ESR-THIRDPARTY-SDNC deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - TO pnf( esr-thirdparty-sdnc AppliesTo pnf, ONE2MANY)
+      - FROM esr-system-info( esr-system-info BelongsTo esr-thirdparty-sdnc, ONE2ONE)(1)
+
+      -(1) IF this ESR-THIRDPARTY-SDNC node is deleted, this FROM node is DELETED also
     required:
     - thirdparty-sdnc-id
     properties:
@@ -59615,8 +53321,9 @@ patchDefinitions:
     description: |
       Persist VNFM address information used by VF-C.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of esr-vnfm, esr-vnfm has esr-system-info, One2One)
-      - ESR-VNFM deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - FROM esr-system-info( esr-system-info BelongsTo esr-vnfm, ONE2ONE)(1)
+
+      -(1) IF this ESR-VNFM node is deleted, this FROM node is DELETED also
     required:
     - vnfm-id
     properties:
@@ -59639,7 +53346,9 @@ patchDefinitions:
     description: |
       evc object is an optional child object of the Configuration object.
       ###### Related Nodes
-      - TO configuration( evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
+      - TO configuration( evc BelongsTo configuration, ONE2ONE)(4)
+
+      -(4) IF this TO node is deleted, this EVC is DELETED also
     required:
     - evc-id
     properties:
@@ -59722,9 +53431,12 @@ patchDefinitions:
     description: |
       Openstack flavor.
       ###### Related Nodes
-      - TO cloud-region( flavor org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vserver( vserver org.onap.relationships.inventory.Uses flavor, MANY2ONE)
-      - FLAVOR cannot be deleted if linked to VSERVER
+      - TO cloud-region( flavor BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-capability( hpa-capability BelongsTo flavor, MANY2ONE)
+      - FROM vserver( vserver Uses flavor, MANY2ONE)
+
+      -FLAVOR cannot be deleted if related to HPA-CAPABILITY,VSERVER
+
     required:
     - flavor-id
     - flavor-name
@@ -59735,7 +53447,7 @@ patchDefinitions:
         description: Flavor id, expected to be unique across cloud-region.
       flavor-name:
         type: string
-        description: Flavor name
+        description: Cloud region Flavor name
       flavor-vcpus:
         type: integer
         format: int32
@@ -59764,6 +53476,11 @@ patchDefinitions:
       flavor-disabled:
         type: boolean
         description: Boolean as to whether this flavor is no longer enabled
+      hpa-capabilities:
+        type: array
+        items:
+          $ref: "#/patchDefinitions/hpa-capability"
+        description: List of flavor specific HPA Capabilities
   flavors:
     description: |
       Collection of openstack flavors.
@@ -59776,12 +53493,14 @@ patchDefinitions:
     description: |
       Entity describing a sequenced segment of forwarding path
       ###### Related Nodes
-      - TO forwarding-path( forwarder org.onap.relationships.inventory.BelongsTo forwarding-path, MANY2ONE)
-      - TO l-interface( forwarder org.onap.relationships.inventory.ForwardsTo l-interface, MANY2ONE)
-      - TO configuration( forwarder org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - TO lag-interface( forwarder org.onap.relationships.inventory.ForwardsTo lag-interface, MANY2ONE)
-      - TO p-interface( forwarder org.onap.relationships.inventory.ForwardsTo p-interface, MANY2ONE)
-      - FORWARDER deletion means associated objects of these types are also DELETED:CONFIGURATION
+      - TO forwarding-path( forwarder BelongsTo forwarding-path, MANY2ONE)(4)
+      - TO l-interface( forwarder ForwardsTo l-interface, MANY2ONE)
+      - TO configuration( forwarder Uses configuration, ONE2ONE)(2)
+      - TO lag-interface( forwarder ForwardsTo lag-interface, MANY2ONE)
+      - TO p-interface( forwarder ForwardsTo p-interface, MANY2ONE)
+
+      -(2) IF this FORWARDER node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this FORWARDER is DELETED also
     required:
     - sequence
     properties:
@@ -59796,7 +53515,9 @@ patchDefinitions:
     description: |
       forwarder object is an optional child object of the Configuration object.
       ###### Related Nodes
-      - TO configuration( forwarder-evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
+      - TO configuration( forwarder-evc BelongsTo configuration, ONE2ONE)(4)
+
+      -(4) IF this TO node is deleted, this FORWARDER-EVC is DELETED also
     required:
     - forwarder-evc-id
     properties:
@@ -59831,11 +53552,13 @@ patchDefinitions:
     description: |
       Entity that describes the sequenced forwarding path between interfaces of services or resources
       ###### Related Nodes
-      - TO service-instance( forwarding-path org.onap.relationships.inventory.AppliesTo service-instance, MANY2ONE)
-      - TO configuration( forwarding-path org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.BelongsTo forwarding-path, MANY2ONE)
-      - FORWARDING-PATH is DELETED when these are DELETED FORWARDER
-      - FORWARDING-PATH deletion means associated objects of these types are also DELETED:CONFIGURATION
+      - TO service-instance( forwarding-path AppliesTo service-instance, MANY2ONE)(4)
+      - TO configuration( forwarding-path Uses configuration, ONE2ONE)(2)
+      - FROM forwarder( forwarder BelongsTo forwarding-path, MANY2ONE)(1)
+
+      -(1) IF this FORWARDING-PATH node is deleted, this FROM node is DELETED also
+      -(2) IF this FORWARDING-PATH node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this FORWARDING-PATH is DELETED also
     required:
     - forwarding-path-id
     - forwarding-path-name
@@ -59856,44 +53579,41 @@ patchDefinitions:
     description: |
       General purpose VNF
       ###### Related Nodes
-      - TO availability-zone( generic-vnf org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - TO complex( generic-vnf org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - TO configuration( generic-vnf org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - TO ctag-pool( generic-vnf org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
-      - TO instance-group( generic-vnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO ipsec-configuration( generic-vnf org.onap.relationships.inventory.Uses ipsec-configuration, MANY2ONE)
-      - TO l3-network( generic-vnf org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - TO license-key-resource( generic-vnf org.onap.relationships.inventory.Uses license-key-resource, MANY2MANY)
-      - TO pnf( generic-vnf tosca.relationships.HostedOn pnf, MANY2MANY)
-      - TO pserver( generic-vnf tosca.relationships.HostedOn pserver, MANY2MANY)
-      - TO vnf-image( generic-vnf org.onap.relationships.inventory.Uses vnf-image, MANY2ONE)
-      - TO volume-group( generic-vnf org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
-      - TO vserver( generic-vnf tosca.relationships.HostedOn vserver, ONE2MANY)
-      - TO virtual-data-center( generic-vnf org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - TO model-ver( generic-vnf org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.PartOf generic-vnf, MANY2MANY)
-      - FROM entitlement( entitlement org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM lag-interface( lag-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM license( license org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM network-profile( network-profile org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf generic-vnf, ONE2MANY)
-      - FROM site-pair-set( site-pair-set org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM line-of-business( line-of-business org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.BridgedTo generic-vnf, MANY2MANY)
-      - FROM platform( platform org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
-      - GENERIC-VNF is DELETED when these are DELETED ENTITLEMENT,VNFC,LAG-INTERFACE,LICENSE,L-INTERFACE,VF-MODULE
-      - GENERIC-VNF deletion means associated objects of these types are also DELETED:CONFIGURATION
+      - TO availability-zone( generic-vnf Uses availability-zone, MANY2MANY)
+      - TO complex( generic-vnf LocatedIn complex, MANY2MANY)
+      - TO configuration( generic-vnf Uses configuration, ONE2MANY)(2)
+      - TO ctag-pool( generic-vnf Uses ctag-pool, MANY2MANY)
+      - TO instance-group( generic-vnf MemberOf instance-group, MANY2MANY)
+      - TO ipsec-configuration( generic-vnf Uses ipsec-configuration, MANY2ONE)
+      - TO l3-network( generic-vnf Uses l3-network, MANY2MANY)
+      - TO license-key-resource( generic-vnf Uses license-key-resource, MANY2MANY)
+      - TO pnf( generic-vnf HostedOn pnf, MANY2MANY)
+      - TO pserver( generic-vnf HostedOn pserver, MANY2MANY)
+      - TO vnf-image( generic-vnf Uses vnf-image, MANY2ONE)
+      - TO volume-group( generic-vnf DependsOn volume-group, ONE2MANY)
+      - TO vserver( generic-vnf HostedOn vserver, ONE2MANY)
+      - TO virtual-data-center( generic-vnf LocatedIn virtual-data-center, MANY2MANY)
+      - TO model-ver( generic-vnf IsA model-ver, Many2One)
+      - FROM allotted-resource( allotted-resource PartOf generic-vnf, MANY2MANY)
+      - FROM entitlement( entitlement BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM vnfc( vnfc BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM lag-interface( lag-interface BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM license( license BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM l-interface( l-interface BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM network-profile( network-profile AppliesTo generic-vnf, MANY2MANY)
+      - FROM service-instance( service-instance ComposedOf generic-vnf, ONE2MANY)
+      - FROM site-pair-set( site-pair-set AppliesTo generic-vnf, MANY2MANY)
+      - FROM vf-module( vf-module BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM line-of-business( line-of-business Uses generic-vnf, MANY2MANY)
+      - FROM logical-link( logical-link BridgedTo generic-vnf, MANY2MANY)
+      - FROM platform( platform Uses generic-vnf, MANY2MANY)
+
+      -(1) IF this GENERIC-VNF node is deleted, this FROM node is DELETED also
+      -(2) IF this GENERIC-VNF node is deleted, this TO node is DELETED also
     required:
     - vnf-id
-    - vnf-instance-id
     - vnf-name
     - vnf-type
-    - vnf-package-name
-    - vnf-discriptor-name
-    - job-id
     - in-maint
     - is-closed-loop-disabled
     properties:
@@ -59997,8 +53717,10 @@ patchDefinitions:
         description: number of network in vnf.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       is-closed-loop-disabled:
         type: boolean
+        description: used to indicate whether closed loop function is enabled on this node
   generic-vnfs:
     description: |
       Collection of VNFs
@@ -60011,9 +53733,10 @@ patchDefinitions:
     description: |
       Openstack group-assignment used to store exclusivity groups (EG).
       ###### Related Nodes
-      - TO cloud-region( group-assignment org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM pserver( pserver org.onap.relationships.inventory.MemberOf group-assignment, MANY2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.MemberOf group-assignment, MANY2MANY)
+      - TO cloud-region( group-assignment BelongsTo cloud-region, MANY2ONE)
+      - FROM pserver( pserver MemberOf group-assignment, MANY2ONE)
+      - FROM tenant( tenant MemberOf group-assignment, MANY2MANY)
+
     required:
     - group-id
     - group-type
@@ -60042,7 +53765,9 @@ patchDefinitions:
   host-route:
     description: |
       ###### Related Nodes
-      - TO subnet( host-route org.onap.relationships.inventory.BelongsTo subnet, MANY2ONE)
+      - TO subnet( host-route BelongsTo subnet, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this HOST-ROUTE is DELETED also
     required:
     - host-route-id
     - route-prefix
@@ -60066,15 +53791,66 @@ patchDefinitions:
         type: array
         items:          
           $ref: "#/patchDefinitions/host-route"
+  hpa-capabilities:
+    description: |
+      Collection of HPA Capabilities
+    properties:
+      hpa-capability:
+        type: array
+        items:          
+          $ref: "#/patchDefinitions/hpa-capability"
+  hpa-capability:
+    description: |
+      Represents a HPA capability
+      ###### Related Nodes
+      - TO flavor( hpa-capability BelongsTo flavor, MANY2ONE)
+      - TO cloud-region( hpa-capability BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-feature-attributes( hpa-feature-attributes BelongsTo hpa-capability, MANY2ONE)(1)
+
+      -(1) IF this HPA-CAPABILITY node is deleted, this FROM node is DELETED also
+    required:
+    - hpa-capability-id
+    - hpa-feature
+    properties:
+      hpa-capability-id:
+        type: string
+        description: UUID to uniquely identify a HPA capability
+      hpa-feature:
+        type: string
+        description: Name of the HPACapability
+      hpa-version:
+        type: string
+        description: HPA schema version
+      architecture:
+        type: string
+        description: Hardware architecture
+  hpa-feature-attributes:
+    description: |
+      HPA Capability Feature attributes
+      ###### Related Nodes
+      - TO hpa-capability( hpa-feature-attributes BelongsTo hpa-capability, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this HPA-FEATURE-ATTRIBUTES is DELETED also
+    required:
+    - hpa-attribute-key
+    properties:
+      hpa-attribute-key:
+        type: string
+        description: name of the specific HPA attribute
+      hpa-attribute-value:
+        type: string
+        description: JSON string specifying the value, unit and type of the specific HPA attribute
   image:
     description: |
       Openstack image.
       ###### Related Nodes
-      - TO cloud-region( image org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo image, MANY2ONE)
-      - FROM vserver( vserver org.onap.relationships.inventory.Uses image, MANY2ONE)
-      - IMAGE cannot be deleted if linked to VSERVER
-      - IMAGE is DELETED when these are DELETED METADATUM
+      - TO cloud-region( image BelongsTo cloud-region, MANY2ONE)
+      - FROM metadatum( metadatum BelongsTo image, MANY2ONE)(1)
+      - FROM vserver( vserver Uses image, MANY2ONE)
+
+      -(1) IF this IMAGE node is deleted, this FROM node is DELETED also
+      -IMAGE cannot be deleted if related to VSERVER
+
     required:
     - image-id
     - image-name
@@ -60136,22 +53912,20 @@ patchDefinitions:
     description: |
       General mechanism for grouping instances
       ###### Related Nodes
-      - TO model( instance-group org.onap.relationships.inventory.Targets model, MANY2MANY)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM pnf( pnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM vip-ipv4-address-list( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM vip-ipv6-address-list( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
+      - TO model( instance-group Targets model, MANY2MANY)
+      - FROM allotted-resource( allotted-resource MemberOf instance-group, MANY2MANY)
+      - FROM generic-vnf( generic-vnf MemberOf instance-group, MANY2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - FROM l3-network( l3-network MemberOf instance-group, MANY2MANY)
+      - FROM l-interface( l-interface MemberOf instance-group, MANY2MANY)
+      - FROM pnf( pnf MemberOf instance-group, MANY2MANY)
+      - FROM service-instance( service-instance MemberOf instance-group, MANY2MANY)
+      - FROM vip-ipv4-address-list( vip-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - FROM vip-ipv6-address-list( vip-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - FROM vnfc( vnfc MemberOf instance-group, MANY2MANY)
+
     required:
-    - instance-group-role
-    - model-invariant-id
-    - model-version-id
     - id
     - description
     - type
@@ -60208,13 +53982,9 @@ patchDefinitions:
       network:
         type: object
         $ref: "#/patchDefinitions/network"
-      aai-internal:
-        type: object
-        $ref: "#/patchDefinitions/aai-internal"
       nodes:
-        type: array
-        items:
-          $ref: "#/patchDefinitions/aai-internal"
+        type: object
+        $ref: "#/patchDefinitions/nodes"
   inventory-item:
     properties:
       inventory-item-type:
@@ -60259,9 +54029,10 @@ patchDefinitions:
     description: |
       IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C
       ###### Related Nodes
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses ipsec-configuration, MANY2ONE)
-      - FROM vig-server( vig-server org.onap.relationships.inventory.BelongsTo ipsec-configuration, MANY2ONE)
-      - IPSEC-CONFIGURATION is DELETED when these are DELETED VIG-SERVER
+      - FROM generic-vnf( generic-vnf Uses ipsec-configuration, MANY2ONE)
+      - FROM vig-server( vig-server BelongsTo ipsec-configuration, MANY2ONE)(1)
+
+      -(1) IF this IPSEC-CONFIGURATION node is deleted, this FROM node is DELETED also
     required:
     - ipsec-configuration-id
     properties:
@@ -60344,26 +54115,28 @@ patchDefinitions:
     description: |
       Logical interfaces, e.g., a vnic.
       ###### Related Nodes
-      - TO generic-vnf( l-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO lag-interface( l-interface org.onap.relationships.inventory.BelongsTo lag-interface, MANY2ONE)
-      - TO instance-group( l-interface org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO l-interface( l-interface org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - TO logical-link( l-interface tosca.relationships.network.LinksTo logical-link, MANY2MANY)
-      - TO newvce( l-interface org.onap.relationships.inventory.BelongsTo newvce, MANY2ONE)
-      - TO p-interface( l-interface tosca.relationships.network.BindsTo p-interface, MANY2ONE)
-      - TO vserver( l-interface tosca.relationships.network.BindsTo vserver, MANY2ONE)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.Uses l-interface, ONE2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Source l-interface, ONE2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Destination l-interface, ONE2MANY)
-      - FROM sriov-vf( sriov-vf org.onap.relationships.inventory.BelongsTo l-interface, ONE2ONE)
-      - FROM vlan( vlan tosca.relationships.network.LinksTo l-interface, MANY2ONE)
-      - FROM configuration( configuration org.onap.relationships.inventory.AppliesTo l-interface, ONE2MANY)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.ForwardsTo l-interface, MANY2ONE)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - L-INTERFACE is DELETED when these are DELETED L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST,LOGICAL-LINK,SRIOV-VF,VLAN
-      - L-INTERFACE deletion means associated objects of these types are also DELETED:LOGICAL-LINK
+      - TO generic-vnf( l-interface BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO lag-interface( l-interface BelongsTo lag-interface, MANY2ONE)(4)
+      - TO instance-group( l-interface MemberOf instance-group, MANY2MANY)
+      - TO l-interface( l-interface BelongsTo l-interface, MANY2ONE)(4)
+      - TO logical-link( l-interface LinksTo logical-link, MANY2MANY)(2)
+      - TO newvce( l-interface BelongsTo newvce, MANY2ONE)(4)
+      - TO p-interface( l-interface BindsTo p-interface, MANY2ONE)(4)
+      - TO vserver( l-interface BindsTo vserver, MANY2ONE)(4)
+      - FROM allotted-resource( allotted-resource Uses l-interface, ONE2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list BelongsTo l-interface, MANY2ONE)(1)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list BelongsTo l-interface, MANY2ONE)(1)
+      - FROM logical-link( logical-link Source l-interface, ONE2MANY)(1)
+      - FROM logical-link( logical-link Destination l-interface, ONE2MANY)(1)
+      - FROM sriov-vf( sriov-vf BelongsTo l-interface, ONE2ONE)(1)
+      - FROM vlan( vlan LinksTo l-interface, MANY2ONE)(1)
+      - FROM configuration( configuration AppliesTo l-interface, ONE2MANY)
+      - FROM forwarder( forwarder ForwardsTo l-interface, MANY2ONE)
+      - FROM l-interface( l-interface BelongsTo l-interface, MANY2ONE)(4)
+
+      -(1) IF this L-INTERFACE node is deleted, this FROM node is DELETED also
+      -(2) IF this L-INTERFACE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this L-INTERFACE is DELETED also
     required:
     - interface-name
     - is-port-mirrored
@@ -60399,6 +54172,7 @@ patchDefinitions:
         description: Human friendly text regarding this interface.
       is-port-mirrored:
         type: boolean
+        description: boolean indicatating whether or not port is a mirrored.
   l-interfaces:
     description: |
       Collection of logical interfaces.
@@ -60411,12 +54185,14 @@ patchDefinitions:
     description: |
       IPv4 Address Range
       ###### Related Nodes
-      - TO instance-group( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - TO l3-network( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - TO subnet( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - TO l-interface( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - TO vlan( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - TO vnfc( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
+      - TO instance-group( l3-interface-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - TO l3-network( l3-interface-ipv4-address-list MemberOf l3-network, MANY2MANY)
+      - TO subnet( l3-interface-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - TO l-interface( l3-interface-ipv4-address-list BelongsTo l-interface, MANY2ONE)(4)
+      - TO vlan( l3-interface-ipv4-address-list BelongsTo vlan, MANY2ONE)(4)
+      - TO vnfc( l3-interface-ipv4-address-list BelongsTo vnfc, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this L3-INTERFACE-IPV4-ADDRESS-LIST is DELETED also
     required:
     - l3-interface-ipv4-address
     properties:
@@ -60442,12 +54218,14 @@ patchDefinitions:
     description: |
       IPv6 Address Range
       ###### Related Nodes
-      - TO instance-group( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - TO l3-network( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - TO subnet( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - TO l-interface( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - TO vlan( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - TO vnfc( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
+      - TO instance-group( l3-interface-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - TO l3-network( l3-interface-ipv6-address-list MemberOf l3-network, MANY2MANY)
+      - TO subnet( l3-interface-ipv6-address-list MemberOf subnet, MANY2MANY)
+      - TO l-interface( l3-interface-ipv6-address-list BelongsTo l-interface, MANY2ONE)(4)
+      - TO vlan( l3-interface-ipv6-address-list BelongsTo vlan, MANY2ONE)(4)
+      - TO vnfc( l3-interface-ipv6-address-list BelongsTo vnfc, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this L3-INTERFACE-IPV6-ADDRESS-LIST is DELETED also
     required:
     - l3-interface-ipv6-address
     properties:
@@ -60473,24 +54251,25 @@ patchDefinitions:
     description: |
       Generic network definition
       ###### Related Nodes
-      - TO instance-group( l3-network org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO network-policy( l3-network org.onap.relationships.inventory.Uses network-policy, MANY2MANY)
-      - TO route-table-reference( l3-network org.onap.relationships.inventory.Uses route-table-reference, MANY2MANY)
-      - TO vpn-binding( l3-network org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - TO model-ver( l3-network org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.PartOf l3-network, MANY2MANY)
-      - FROM cloud-region( cloud-region org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM complex( complex org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - FROM ctag-assignment( ctag-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM segmentation-assignment( segmentation-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf l3-network, ONE2MANY)
-      - FROM subnet( subnet org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.DependsOn l3-network, MANY2MANY)
-      - L3-NETWORK is DELETED when these are DELETED CTAG-ASSIGNMENT,SEGMENTATION-ASSIGNMENT,SUBNET
+      - TO instance-group( l3-network MemberOf instance-group, MANY2MANY)
+      - TO network-policy( l3-network Uses network-policy, MANY2MANY)
+      - TO route-table-reference( l3-network Uses route-table-reference, MANY2MANY)
+      - TO vpn-binding( l3-network Uses vpn-binding, MANY2MANY)
+      - TO model-ver( l3-network IsA model-ver, Many2One)
+      - FROM allotted-resource( allotted-resource PartOf l3-network, MANY2MANY)
+      - FROM cloud-region( cloud-region Uses l3-network, MANY2MANY)
+      - FROM complex( complex Uses l3-network, MANY2MANY)
+      - FROM generic-vnf( generic-vnf Uses l3-network, MANY2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list MemberOf l3-network, MANY2MANY)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list MemberOf l3-network, MANY2MANY)
+      - FROM ctag-assignment( ctag-assignment BelongsTo l3-network, MANY2ONE)(1)
+      - FROM segmentation-assignment( segmentation-assignment BelongsTo l3-network, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf l3-network, ONE2MANY)
+      - FROM subnet( subnet BelongsTo l3-network, MANY2ONE)(1)
+      - FROM tenant( tenant Uses l3-network, MANY2MANY)
+      - FROM vf-module( vf-module DependsOn l3-network, MANY2MANY)
+
+      -(1) IF this L3-NETWORK node is deleted, this FROM node is DELETED also
     required:
     - network-id
     - network-name
@@ -60519,6 +54298,7 @@ patchDefinitions:
         description: Neutron network id of this Interface
       is-bound-to-vpn:
         type: boolean
+        description: Set to true if bound to VPN
       service-id:
         type: string
         description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
@@ -60536,17 +54316,19 @@ patchDefinitions:
     description: |
       Link aggregate interface
       ###### Related Nodes
-      - TO generic-vnf( lag-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO lag-link( lag-interface tosca.relationships.network.LinksTo lag-link, MANY2MANY)
-      - TO logical-link( lag-interface org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - TO p-interface( lag-interface org.onap.relationships.inventory.Uses p-interface, MANY2MANY)
-      - TO pnf( lag-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - TO pserver( lag-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - TO vpls-pe( lag-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo lag-interface, MANY2ONE)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.ForwardsTo lag-interface, MANY2ONE)
-      - LAG-INTERFACE is DELETED when these are DELETED L-INTERFACE
-      - LAG-INTERFACE deletion means associated objects of these types are also DELETED:LAG-LINK,LOGICAL-LINK
+      - TO generic-vnf( lag-interface BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO lag-link( lag-interface LinksTo lag-link, MANY2MANY)(2)
+      - TO logical-link( lag-interface Uses logical-link, MANY2MANY)(2)
+      - TO p-interface( lag-interface Uses p-interface, MANY2MANY)
+      - TO pnf( lag-interface BindsTo pnf, MANY2ONE)(4)
+      - TO pserver( lag-interface BindsTo pserver, MANY2ONE)(4)
+      - TO vpls-pe( lag-interface BindsTo vpls-pe, MANY2ONE)(4)
+      - FROM l-interface( l-interface BelongsTo lag-interface, MANY2ONE)(1)
+      - FROM forwarder( forwarder ForwardsTo lag-interface, MANY2ONE)
+
+      -(1) IF this LAG-INTERFACE node is deleted, this FROM node is DELETED also
+      -(2) IF this LAG-INTERFACE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this LAG-INTERFACE is DELETED also
     required:
     - interface-name
     - in-maint
@@ -60569,8 +54351,10 @@ patchDefinitions:
     description: |
       LAG links can connect lag-interfaces
       ###### Related Nodes
-      - FROM lag-interface( lag-interface tosca.relationships.network.LinksTo lag-link, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Uses lag-link, MANY2MANY)
+      - FROM lag-interface( lag-interface LinksTo lag-link, MANY2MANY)(3)
+      - FROM logical-link( logical-link Uses lag-link, MANY2MANY)
+
+      -(3) IF this FROM node is deleted, this LAG-LINK is DELETED also
     required:
     - link-name
     properties:
@@ -60589,8 +54373,10 @@ patchDefinitions:
     description: |
       Metadata for license group.
       ###### Related Nodes
-      - TO generic-vnf( license org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO vce( license org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
+      - TO generic-vnf( license BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO vce( license BelongsTo vce, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this LICENSE is DELETED also
     required:
     - group-uuid
     - resource-uuid
@@ -60613,7 +54399,8 @@ patchDefinitions:
     description: |
       describes a line-of-business
       ###### Related Nodes
-      - TO generic-vnf( line-of-business org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
+      - TO generic-vnf( line-of-business Uses generic-vnf, MANY2MANY)
+
     required:
     - line-of-business-name
     properties:
@@ -60632,24 +54419,27 @@ patchDefinitions:
     description: |
       Logical links generally connect l-interfaces but are used to express logical connectivity between two points
       ###### Related Nodes
-      - TO l-interface( logical-link org.onap.relationships.inventory.Source l-interface, ONE2MANY)
-      - TO l-interface( logical-link org.onap.relationships.inventory.Destination l-interface, ONE2MANY)
-      - TO cloud-region( logical-link org.onap.relationships.inventory.LocatedIn cloud-region, MANY2MANY)
-      - TO generic-vnf( logical-link org.onap.relationships.inventory.BridgedTo generic-vnf, MANY2MANY)
-      - TO lag-link( logical-link org.onap.relationships.inventory.Uses lag-link, MANY2MANY)
-      - TO logical-link( logical-link org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - TO pnf( logical-link org.onap.relationships.inventory.BridgedTo pnf, MANY2MANY)
-      - TO pserver( logical-link org.onap.relationships.inventory.BridgedTo pserver, MANY2MANY)
-      - TO vpn-binding( logical-link org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - TO virtual-data-center( logical-link org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - TO model-ver( logical-link org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM configuration( configuration org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - FROM lag-interface( lag-interface org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - FROM l-interface( l-interface tosca.relationships.network.LinksTo logical-link, MANY2MANY)
-      - FROM p-interface( p-interface tosca.relationships.network.LinksTo logical-link, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - FROM vlan( vlan org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
+      - TO l-interface( logical-link Source l-interface, ONE2MANY)(4)
+      - TO l-interface( logical-link Destination l-interface, ONE2MANY)(4)
+      - TO cloud-region( logical-link LocatedIn cloud-region, MANY2MANY)
+      - TO generic-vnf( logical-link BridgedTo generic-vnf, MANY2MANY)
+      - TO lag-link( logical-link Uses lag-link, MANY2MANY)
+      - TO logical-link( logical-link Uses logical-link, MANY2MANY)
+      - TO pnf( logical-link BridgedTo pnf, MANY2MANY)
+      - TO pserver( logical-link BridgedTo pserver, MANY2MANY)
+      - TO vpn-binding( logical-link Uses vpn-binding, MANY2MANY)
+      - TO virtual-data-center( logical-link LocatedIn virtual-data-center, MANY2MANY)
+      - TO model-ver( logical-link IsA model-ver, Many2One)
+      - FROM configuration( configuration Uses logical-link, ONE2MANY)(3)
+      - FROM lag-interface( lag-interface Uses logical-link, MANY2MANY)(3)
+      - FROM l-interface( l-interface LinksTo logical-link, MANY2MANY)(3)
+      - FROM p-interface( p-interface LinksTo logical-link, MANY2ONE)
+      - FROM service-instance( service-instance Uses logical-link, ONE2MANY)(3)
+      - FROM vlan( vlan Uses logical-link, MANY2MANY)(3)
+      - FROM logical-link( logical-link Uses logical-link, MANY2MANY)
+
+      -(3) IF this FROM node is deleted, this LOGICAL-LINK is DELETED also
+      -(4) IF this TO node is deleted, this LOGICAL-LINK is DELETED also
     required:
     - link-name
     - in-maint
@@ -60660,6 +54450,7 @@ patchDefinitions:
         description: e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       link-type:
         type: string
         description: Type of logical link, e.g., evc
@@ -60695,11 +54486,13 @@ patchDefinitions:
     description: |
       Key/value pairs
       ###### Related Nodes
-      - TO configuration( metadatum org.onap.relationships.inventory.BelongsTo configuration, MANY2ONE)
-      - TO connector( metadatum org.onap.relationships.inventory.BelongsTo connector, MANY2ONE)
-      - TO image( metadatum org.onap.relationships.inventory.BelongsTo image, MANY2ONE)
-      - TO model-ver( metadatum org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - TO service-instance( metadatum org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
+      - TO configuration( metadatum BelongsTo configuration, MANY2ONE)(4)
+      - TO connector( metadatum BelongsTo connector, MANY2ONE)(4)
+      - TO image( metadatum BelongsTo image, MANY2ONE)(4)
+      - TO model-ver( metadatum BelongsTo model-ver, MANY2ONE)(4)
+      - TO service-instance( metadatum BelongsTo service-instance, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this METADATUM is DELETED also
     required:
     - metaname
     - metaval
@@ -60712,13 +54505,15 @@ patchDefinitions:
     description: |
       Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version
       ###### Related Nodes
-      - TO model( model-ver org.onap.relationships.inventory.BelongsTo model, MANY2ONE)
-      - FROM instance-group( instance-group org.onap.relationships.inventory.Targets model, MANY2MANY)
-      - FROM model-ver( model-ver org.onap.relationships.inventory.BelongsTo model, MANY2ONE)
-      - FROM named-query( named-query org.onap.relationships.inventory.AppliesTo model, ONE2MANY)
-      - FROM named-query-element( named-query-element org.onap.relationships.inventory.IsA model, MANY2ONE)
-      - MODEL cannot be deleted if linked to INSTANCE-GROUP,NAMED-QUERY,NAMED-QUERY-ELEMENT
-      - MODEL is DELETED when these are DELETED MODEL-VER
+      - TO model( model-ver BelongsTo model, MANY2ONE)(1)
+      - FROM instance-group( instance-group Targets model, MANY2MANY)
+      - FROM model-ver( model-ver BelongsTo model, MANY2ONE)(1)
+      - FROM named-query( named-query AppliesTo model, ONE2MANY)
+      - FROM named-query-element( named-query-element IsA model, MANY2ONE)
+
+      -(1) IF this MODEL node is deleted, this FROM node is DELETED also
+      -MODEL cannot be deleted if related to INSTANCE-GROUP,NAMED-QUERY,NAMED-QUERY-ELEMENT
+
     required:
     - model-invariant-id
     - model-type
@@ -60750,9 +54545,11 @@ patchDefinitions:
     description: |
       This is how we would capture constraints defining allowed sets of elements.
       ###### Related Nodes
-      - TO model-element( model-constraint org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM constrained-element-set( constrained-element-set org.onap.relationships.inventory.BelongsTo model-constraint, MANY2ONE)
-      - MODEL-CONSTRAINT is DELETED when these are DELETED CONSTRAINED-ELEMENT-SET
+      - TO model-element( model-constraint BelongsTo model-element, MANY2ONE)(4)
+      - FROM constrained-element-set( constrained-element-set BelongsTo model-constraint, MANY2ONE)(1)
+
+      -(1) IF this MODEL-CONSTRAINT node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this MODEL-CONSTRAINT is DELETED also
     required:
     - model-constraint-uuid
     - constrained-element-set-uuid-to-replace
@@ -60775,14 +54572,16 @@ patchDefinitions:
     description: |
       Defines how other models combine to make up a higher-level model.
       ###### Related Nodes
-      - TO element-choice-set( model-element org.onap.relationships.inventory.BelongsTo element-choice-set, MANY2ONE)
-      - TO model-element( model-element org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - TO model-ver( model-element org.onap.relationships.inventory.IsA model-ver, MANY2ONE)
-      - TO model-ver( model-element org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - FROM constrained-element-set( constrained-element-set org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM model-constraint( model-constraint org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - MODEL-ELEMENT is DELETED when these are DELETED CONSTRAINED-ELEMENT-SET,MODEL-CONSTRAINT
+      - TO element-choice-set( model-element BelongsTo element-choice-set, MANY2ONE)(4)
+      - TO model-element( model-element BelongsTo model-element, MANY2ONE)(4)
+      - TO model-ver( model-element IsA model-ver, MANY2ONE)
+      - TO model-ver( model-element BelongsTo model-ver, MANY2ONE)(4)
+      - FROM constrained-element-set( constrained-element-set BelongsTo model-element, MANY2ONE)(1)
+      - FROM model-constraint( model-constraint BelongsTo model-element, MANY2ONE)(1)
+      - FROM model-element( model-element BelongsTo model-element, MANY2ONE)(4)
+
+      -(1) IF this MODEL-ELEMENT node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this MODEL-ELEMENT is DELETED also
     required:
     - model-element-uuid
     - new-data-del-flag
@@ -60808,18 +54607,21 @@ patchDefinitions:
     description: |
       Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models
       ###### Related Nodes
-      - TO model( model-ver org.onap.relationships.inventory.BelongsTo model, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.IsA model-ver, MANY2ONE)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - MODEL-VER cannot be deleted if linked to MODEL-ELEMENT
-      - MODEL-VER is DELETED when these are DELETED METADATUM,MODEL-ELEMENT
+      - TO model( model-ver BelongsTo model, MANY2ONE)(4)
+      - FROM model-element( model-element IsA model-ver, MANY2ONE)
+      - FROM metadatum( metadatum BelongsTo model-ver, MANY2ONE)(1)
+      - FROM model-element( model-element BelongsTo model-ver, MANY2ONE)(1)
+      - FROM allotted-resource( allotted-resource IsA model-ver, Many2One)
+      - FROM generic-vnf( generic-vnf IsA model-ver, Many2One)
+      - FROM l3-network( l3-network IsA model-ver, Many2One)
+      - FROM logical-link( logical-link IsA model-ver, Many2One)
+      - FROM service-instance( service-instance IsA model-ver, Many2One)
+      - FROM vf-module( vf-module IsA model-ver, Many2One)
+
+      -(1) IF this MODEL-VER node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this MODEL-VER is DELETED also
+      -MODEL-VER cannot be deleted if related to MODEL-ELEMENT
+
     required:
     - model-version-id
     - model-name
@@ -60857,7 +54659,8 @@ patchDefinitions:
   multicast-configuration:
     description: |
       ###### Related Nodes
-      - FROM vlan( vlan org.onap.relationships.inventory.Uses multicast-configuration, MANY2MANY)
+      - FROM vlan( vlan Uses multicast-configuration, MANY2MANY)
+
     required:
     - multicast-configuration-id
     - multicast-protocol
@@ -60890,10 +54693,11 @@ patchDefinitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query( named-query-element org.onap.relationships.inventory.BelongsTo named-query, ONE2ONE)
-      - TO model( named-query org.onap.relationships.inventory.AppliesTo model, ONE2MANY)
-      - FROM named-query-element( named-query-element org.onap.relationships.inventory.BelongsTo named-query, ONE2ONE)
-      - NAMED-QUERY is DELETED when these are DELETED NAMED-QUERY-ELEMENT
+      - TO named-query( named-query-element BelongsTo named-query, ONE2ONE)(1)
+      - TO model( named-query AppliesTo model, ONE2MANY)
+      - FROM named-query-element( named-query-element BelongsTo named-query, ONE2ONE)(1)
+
+      -(1) IF this NAMED-QUERY node is deleted, this FROM node is DELETED also
     required:
     - named-query-uuid
     - named-query-name
@@ -60913,13 +54717,15 @@ patchDefinitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query( named-query-element org.onap.relationships.inventory.BelongsTo named-query, ONE2ONE)
-      - TO model( named-query-element org.onap.relationships.inventory.IsA model, MANY2ONE)
-      - TO named-query-element( named-query-element org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - FROM property-constraint( property-constraint org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - FROM related-lookup( related-lookup org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - FROM named-query-element( named-query-element org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - NAMED-QUERY-ELEMENT is DELETED when these are DELETED PROPERTY-CONSTRAINT,RELATED-LOOKUP
+      - TO named-query( named-query-element BelongsTo named-query, ONE2ONE)(4)
+      - TO model( named-query-element IsA model, MANY2ONE)
+      - TO named-query-element( named-query-element BelongsTo named-query-element, MANY2ONE)(4)
+      - FROM property-constraint( property-constraint BelongsTo named-query-element, MANY2ONE)(1)
+      - FROM related-lookup( related-lookup BelongsTo named-query-element, MANY2ONE)(1)
+      - FROM named-query-element( named-query-element BelongsTo named-query-element, MANY2ONE)(4)
+
+      -(1) IF this NAMED-QUERY-ELEMENT node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this NAMED-QUERY-ELEMENT is DELETED also
     required:
     - named-query-element-uuid
     properties:
@@ -61026,8 +54832,9 @@ patchDefinitions:
   network-policy:
     description: |
       ###### Related Nodes
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.Uses network-policy, ONE2ONE)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.Uses network-policy, MANY2MANY)
+      - FROM allotted-resource( allotted-resource Uses network-policy, ONE2ONE)
+      - FROM l3-network( l3-network Uses network-policy, MANY2MANY)
+
     required:
     - network-policy-id
     properties:
@@ -61044,7 +54851,8 @@ patchDefinitions:
     description: |
       Network profile populated by SDN-GP for SNMP
       ###### Related Nodes
-      - TO generic-vnf( network-profile org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
+      - TO generic-vnf( network-profile AppliesTo generic-vnf, MANY2MANY)
+
     required:
     - nm-profile-name
     properties:
@@ -61066,8 +54874,9 @@ patchDefinitions:
     description: |
       This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.
       ###### Related Nodes
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo newvce, MANY2ONE)
-      - NEWVCE is DELETED when these are DELETED L-INTERFACE
+      - FROM l-interface( l-interface BelongsTo newvce, MANY2ONE)(1)
+
+      -(1) IF this NEWVCE node is deleted, this FROM node is DELETED also
     required:
     - vnf-id2
     - vnf-name
@@ -61108,6 +54917,12 @@ patchDefinitions:
         type: array
         items:          
           $ref: "#/patchDefinitions/newvce"
+  nodes:
+    properties:
+      inventory-item-data:
+        type: array
+        items:
+          $ref: "#/patchDefinitions/inventory-item-data"
   notification-event:
     properties:
       cambria.partition:
@@ -61163,9 +54978,10 @@ patchDefinitions:
     description: |
       OAM network, to be deprecated shortly.  Do not use for new purposes. 
       ###### Related Nodes
-      - TO cloud-region( oam-network org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO complex( oam-network org.onap.relationships.inventory.AppliesTo complex, MANY2MANY)
-      - TO service-capability( oam-network org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
+      - TO cloud-region( oam-network BelongsTo cloud-region, MANY2ONE)
+      - TO complex( oam-network AppliesTo complex, MANY2MANY)
+      - TO service-capability( oam-network AppliesTo service-capability, MANY2MANY)
+
     required:
     - network-uuid
     - network-name
@@ -61200,8 +55016,9 @@ patchDefinitions:
     description: |
       It is a logical partition of the cloud which allows to have multiple environments in the production AIC.
       ###### Related Nodes
-      - TO operational-environment( operational-environment org.onap.relationships.inventory.Uses operational-environment, ONE2ONE)
-      - FROM operational-environment( operational-environment org.onap.relationships.inventory.Uses operational-environment, ONE2ONE)
+      - TO operational-environment( operational-environment Uses operational-environment, ONE2ONE)
+      - FROM operational-environment( operational-environment Uses operational-environment, ONE2ONE)
+
     required:
     - operational-environment-id
     - operational-environment-name
@@ -61280,7 +55097,8 @@ patchDefinitions:
     description: |
       describes an owning-entity
       ###### Related Nodes
-      - FROM service-instance( service-instance org.onap.relationships.inventory.BelongsTo owning-entity, MANY2ONE)
+      - FROM service-instance( service-instance BelongsTo owning-entity, MANY2ONE)
+
     required:
     - owning-entity-id
     - owning-entity-name
@@ -61295,17 +55113,19 @@ patchDefinitions:
     description: |
       Physical interface (e.g., nic)
       ###### Related Nodes
-      - TO logical-link( p-interface tosca.relationships.network.LinksTo logical-link, MANY2ONE)
-      - TO physical-link( p-interface tosca.relationships.network.LinksTo physical-link, MANY2ONE)
-      - TO pnf( p-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - TO pserver( p-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - TO vpls-pe( p-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - FROM lag-interface( lag-interface org.onap.relationships.inventory.Uses p-interface, MANY2MANY)
-      - FROM l-interface( l-interface tosca.relationships.network.BindsTo p-interface, MANY2ONE)
-      - FROM sriov-pf( sriov-pf org.onap.relationships.inventory.BelongsTo p-interface, ONE2ONE)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.ForwardsTo p-interface, MANY2ONE)
-      - P-INTERFACE is DELETED when these are DELETED L-INTERFACE,SRIOV-PF
-      - P-INTERFACE deletion means associated objects of these types are also DELETED:PHYSICAL-LINK
+      - TO logical-link( p-interface LinksTo logical-link, MANY2ONE)
+      - TO physical-link( p-interface LinksTo physical-link, MANY2ONE)(2)
+      - TO pnf( p-interface BindsTo pnf, MANY2ONE)(4)
+      - TO pserver( p-interface BindsTo pserver, MANY2ONE)(4)
+      - TO vpls-pe( p-interface BindsTo vpls-pe, MANY2ONE)(4)
+      - FROM lag-interface( lag-interface Uses p-interface, MANY2MANY)
+      - FROM l-interface( l-interface BindsTo p-interface, MANY2ONE)(1)
+      - FROM sriov-pf( sriov-pf BelongsTo p-interface, ONE2ONE)(1)
+      - FROM forwarder( forwarder ForwardsTo p-interface, MANY2ONE)
+
+      -(1) IF this P-INTERFACE node is deleted, this FROM node is DELETED also
+      -(2) IF this P-INTERFACE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this P-INTERFACE is DELETED also
     required:
     - interface-name
     - in-maint
@@ -61352,7 +55172,9 @@ patchDefinitions:
     description: |
       Collection of physical connections, typically between p-interfaces
       ###### Related Nodes
-      - FROM p-interface( p-interface tosca.relationships.network.LinksTo physical-link, MANY2ONE)
+      - FROM p-interface( p-interface LinksTo physical-link, MANY2ONE)(3)
+
+      -(3) IF this FROM node is deleted, this PHYSICAL-LINK is DELETED also
     required:
     - link-name
     properties:
@@ -61403,7 +55225,8 @@ patchDefinitions:
     description: |
       describes a platform
       ###### Related Nodes
-      - TO generic-vnf( platform org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
+      - TO generic-vnf( platform Uses generic-vnf, MANY2MANY)
+
     required:
     - platform-name
     properties:
@@ -61422,17 +55245,18 @@ patchDefinitions:
     description: |
       PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.
       ###### Related Nodes
-      - TO complex( pnf org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO instance-group( pnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO zone( pnf org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM esr-thirdparty-sdnc( esr-thirdparty-sdnc has pnf, One2Many)
-      - FROM generic-vnf( generic-vnf tosca.relationships.HostedOn pnf, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.BridgedTo pnf, MANY2MANY)
-      - FROM lag-interface( lag-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - FROM p-interface( p-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf pnf, ONE2MANY)
-      - FROM configuration( configuration org.onap.relationships.inventory.AppliesTo pnf, ONE2MANY)
-      - PNF is DELETED when these are DELETED LAG-INTERFACE,P-INTERFACE
+      - TO complex( pnf LocatedIn complex, MANY2ONE)
+      - TO instance-group( pnf MemberOf instance-group, MANY2MANY)
+      - TO zone( pnf LocatedIn zone, MANY2ONE)
+      - FROM esr-thirdparty-sdnc( esr-thirdparty-sdnc AppliesTo pnf, ONE2MANY)
+      - FROM generic-vnf( generic-vnf HostedOn pnf, MANY2MANY)
+      - FROM logical-link( logical-link BridgedTo pnf, MANY2MANY)
+      - FROM lag-interface( lag-interface BindsTo pnf, MANY2ONE)(1)
+      - FROM p-interface( p-interface BindsTo pnf, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf pnf, ONE2MANY)
+      - FROM configuration( configuration AppliesTo pnf, ONE2MANY)
+
+      -(1) IF this PNF node is deleted, this FROM node is DELETED also
     required:
     - pnf-name
     - in-maint
@@ -61472,6 +55296,7 @@ patchDefinitions:
         description: sw-version is the version of SW for the hosted application on the PNF.
       in-maint:
         type: boolean
+        description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       frame-id:
         type: string
         description: ID of the physical frame (relay rack) where pnf is installed.
@@ -61508,9 +55333,11 @@ patchDefinitions:
     description: |
       Used to capture the network interfaces of this VCE
       ###### Related Nodes
-      - TO vce( port-group org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM cvlan-tag( cvlan-tag org.onap.relationships.inventory.BelongsTo port-group, MANY2ONE)
-      - PORT-GROUP is DELETED when these are DELETED CVLAN-TAG
+      - TO vce( port-group BelongsTo vce, MANY2ONE)(4)
+      - FROM cvlan-tag( cvlan-tag BelongsTo port-group, MANY2ONE)(1)
+
+      -(1) IF this PORT-GROUP node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this PORT-GROUP is DELETED also
     required:
     - interface-id
     - orchestration-status
@@ -61537,7 +55364,8 @@ patchDefinitions:
     description: |
       describes the project
       ###### Related Nodes
-      - TO service-instance( project org.onap.relationships.inventory.Uses service-instance, ONE2MANY)
+      - TO service-instance( project Uses service-instance, ONE2MANY)
+
     required:
     - project-name
     properties:
@@ -61564,7 +55392,9 @@ patchDefinitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query-element( property-constraint org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
+      - TO named-query-element( property-constraint BelongsTo named-query-element, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this PROPERTY-CONSTRAINT is DELETED also
     required:
     - property-constraint-uuid
     - constraint-type
@@ -61589,19 +55419,20 @@ patchDefinitions:
     description: |
       Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.
       ###### Related Nodes
-      - TO group-assignment( pserver org.onap.relationships.inventory.MemberOf group-assignment, MANY2ONE)
-      - TO availability-zone( pserver org.onap.relationships.inventory.MemberOf availability-zone, MANY2ONE)
-      - TO cloud-region( pserver org.onap.relationships.inventory.LocatedIn cloud-region, MANY2ONE)
-      - TO complex( pserver org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO zone( pserver org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM generic-vnf( generic-vnf tosca.relationships.HostedOn pserver, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.BridgedTo pserver, MANY2MANY)
-      - FROM lag-interface( lag-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - FROM p-interface( p-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - FROM vserver( vserver tosca.relationships.HostedOn pserver, MANY2ONE)
-      - PSERVER cannot be deleted if linked to GENERIC-VNF,LOGICAL-LINK,VSERVER
-      - PSERVER is DELETED when these are DELETED LAG-INTERFACE,P-INTERFACE
-      - PSERVER cannot be deleted if linked to GROUP-ASSIGNMENT
+      - TO group-assignment( pserver MemberOf group-assignment, MANY2ONE)
+      - TO availability-zone( pserver MemberOf availability-zone, MANY2ONE)
+      - TO cloud-region( pserver LocatedIn cloud-region, MANY2ONE)
+      - TO complex( pserver LocatedIn complex, MANY2ONE)
+      - TO zone( pserver LocatedIn zone, MANY2ONE)
+      - FROM generic-vnf( generic-vnf HostedOn pserver, MANY2MANY)
+      - FROM logical-link( logical-link BridgedTo pserver, MANY2MANY)
+      - FROM lag-interface( lag-interface BindsTo pserver, MANY2ONE)(1)
+      - FROM p-interface( p-interface BindsTo pserver, MANY2ONE)(1)
+      - FROM vserver( vserver HostedOn pserver, MANY2ONE)
+
+      -(1) IF this PSERVER node is deleted, this FROM node is DELETED also
+      -PSERVER cannot be deleted if related to GENERIC-VNF,LOGICAL-LINK,VSERVER,GROUP-ASSIGNMENT
+
     required:
     - hostname
     - in-maint
@@ -61671,6 +55502,7 @@ patchDefinitions:
         description: internet topology of Pserver
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
   pservers:
     description: |
       Collection of compute hosts.
@@ -61693,7 +55525,9 @@ patchDefinitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query-element( related-lookup org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
+      - TO named-query-element( related-lookup BelongsTo named-query-element, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this RELATED-LOOKUP is DELETED also
     required:
     - related-lookup-uuid
     - source-node-type
@@ -61796,7 +55630,8 @@ patchDefinitions:
     description: |
       Openstack route table reference.
       ###### Related Nodes
-      - FROM l3-network( l3-network org.onap.relationships.inventory.Uses route-table-reference, MANY2MANY)
+      - FROM l3-network( l3-network Uses route-table-reference, MANY2MANY)
+
     required:
     - route-table-reference-id
     - route-table-reference-fqdn
@@ -61819,7 +55654,9 @@ patchDefinitions:
     description: |
       Route target information
       ###### Related Nodes
-      - TO vpn-binding( route-target org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2ONE)
+      - TO vpn-binding( route-target BelongsTo vpn-binding, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this ROUTE-TARGET is DELETED also
     required:
     - global-route-target
     - route-target-role
@@ -61841,9 +55678,11 @@ patchDefinitions:
   routing-instance:
     description: |
       ###### Related Nodes
-      - TO site-pair-set( routing-instance org.onap.relationships.inventory.BelongsTo site-pair-set, MANY2ONE)
-      - FROM site-pair( site-pair org.onap.relationships.inventory.BelongsTo routing-instance, MANY2ONE)
-      - ROUTING-INSTANCE is DELETED when these are DELETED SITE-PAIR
+      - TO site-pair-set( routing-instance BelongsTo site-pair-set, MANY2ONE)(4)
+      - FROM site-pair( site-pair BelongsTo routing-instance, MANY2ONE)(1)
+
+      -(1) IF this ROUTING-INSTANCE node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this ROUTING-INSTANCE is DELETED also
     required:
     - routing-instance-id
     properties:
@@ -61913,7 +55752,9 @@ patchDefinitions:
     description: |
       Openstack segmentation assignment.
       ###### Related Nodes
-      - TO l3-network( segmentation-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
+      - TO l3-network( segmentation-assignment BelongsTo l3-network, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this SEGMENTATION-ASSIGNMENT is DELETED also
     required:
     - segmentation-id
     properties:
@@ -61956,9 +55797,11 @@ patchDefinitions:
     description: |
       Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.
       ###### Related Nodes
-      - FROM availability-zone( availability-zone org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
-      - FROM oam-network( oam-network org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
-      - SERVICE-CAPABILITY cannot be deleted if linked to AVAILABILITY-ZONE,OAM-NETWORK
+      - FROM availability-zone( availability-zone AppliesTo service-capability, MANY2MANY)
+      - FROM oam-network( oam-network AppliesTo service-capability, MANY2MANY)
+
+      -SERVICE-CAPABILITY cannot be deleted if related to AVAILABILITY-ZONE,OAM-NETWORK
+
     required:
     - service-type
     - vnf-type
@@ -61997,37 +55840,34 @@ patchDefinitions:
     description: |
       Instance of a service
       ###### Related Nodes
-      - TO generic-vnf( service-instance org.onap.relationships.inventory.ComposedOf generic-vnf, ONE2MANY)
-      - TO l3-network( service-instance org.onap.relationships.inventory.ComposedOf l3-network, ONE2MANY)
-      - TO owning-entity( service-instance org.onap.relationships.inventory.BelongsTo owning-entity, MANY2ONE)
-      - TO allotted-resource( service-instance org.onap.relationships.inventory.Uses allotted-resource, MANY2MANY)
-      - TO configuration( service-instance org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - TO connector( service-instance org.onap.relationships.inventory.Uses connector, MANY2MANY)
-      - TO ctag-assignment( service-instance org.onap.relationships.inventory.Uses ctag-assignment, ONE2MANY)
-      - TO cvlan-tag( service-instance org.onap.relationships.inventory.ComposedOf cvlan-tag, MANY2MANY)
-      - TO instance-group( service-instance org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO logical-link( service-instance org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - TO pnf( service-instance org.onap.relationships.inventory.ComposedOf pnf, ONE2MANY)
-      - TO service-instance( service-instance org.onap.relationships.inventory.ComposedOf service-instance, ONE2MANY)
-      - TO vlan( service-instance org.onap.relationships.inventory.ComposedOf vlan, ONE2MANY)
-      - TO zone( service-instance org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - TO service-subscription( service-instance org.onap.relationships.inventory.BelongsTo service-subscription, MANY2ONE)
-      - TO vce( service-instance org.onap.relationships.inventory.ComposedOf vce, ONE2MANY)
-      - TO model-ver( service-instance org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM project( project org.onap.relationships.inventory.Uses service-instance, ONE2MANY)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
-      - FROM forwarding-path( forwarding-path org.onap.relationships.inventory.AppliesTo service-instance, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf service-instance, ONE2MANY)
-      - SERVICE-INSTANCE is DELETED when these are DELETED ALLOTTED-RESOURCE,METADATUM,FORWARDING-PATH
-      - SERVICE-INSTANCE deletion means associated objects of these types are also DELETED:LOGICAL-LINK
+      - TO generic-vnf( service-instance ComposedOf generic-vnf, ONE2MANY)
+      - TO l3-network( service-instance ComposedOf l3-network, ONE2MANY)
+      - TO owning-entity( service-instance BelongsTo owning-entity, MANY2ONE)
+      - TO allotted-resource( service-instance Uses allotted-resource, MANY2MANY)
+      - TO configuration( service-instance Uses configuration, ONE2MANY)
+      - TO connector( service-instance Uses connector, MANY2MANY)
+      - TO ctag-assignment( service-instance Uses ctag-assignment, ONE2MANY)
+      - TO cvlan-tag( service-instance ComposedOf cvlan-tag, MANY2MANY)
+      - TO instance-group( service-instance MemberOf instance-group, MANY2MANY)
+      - TO logical-link( service-instance Uses logical-link, ONE2MANY)(2)
+      - TO pnf( service-instance ComposedOf pnf, ONE2MANY)
+      - TO service-instance( service-instance ComposedOf service-instance, ONE2MANY)
+      - TO vlan( service-instance ComposedOf vlan, ONE2MANY)
+      - TO zone( service-instance LocatedIn zone, MANY2ONE)
+      - TO service-subscription( service-instance BelongsTo service-subscription, MANY2ONE)(4)
+      - TO vce( service-instance ComposedOf vce, ONE2MANY)
+      - TO model-ver( service-instance IsA model-ver, Many2One)
+      - FROM project( project Uses service-instance, ONE2MANY)
+      - FROM allotted-resource( allotted-resource BelongsTo service-instance, MANY2ONE)(1)
+      - FROM metadatum( metadatum BelongsTo service-instance, MANY2ONE)(1)
+      - FROM forwarding-path( forwarding-path AppliesTo service-instance, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf service-instance, ONE2MANY)
+
+      -(1) IF this SERVICE-INSTANCE node is deleted, this FROM node is DELETED also
+      -(2) IF this SERVICE-INSTANCE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this SERVICE-INSTANCE is DELETED also
     required:
     - service-instance-id
-    - service-type
-    - service-role
-    - created-at
-    - updated-at
-    - description
     properties:
       service-instance-id:
         type: string
@@ -62104,10 +55944,12 @@ patchDefinitions:
     description: |
       Object that group service instances.
       ###### Related Nodes
-      - TO customer( service-subscription org.onap.relationships.inventory.BelongsTo customer, MANY2ONE)
-      - TO tenant( service-subscription org.onap.relationships.inventory.Uses tenant, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.BelongsTo service-subscription, MANY2ONE)
-      - SERVICE-SUBSCRIPTION is DELETED when these are DELETED SERVICE-INSTANCE
+      - TO customer( service-subscription BelongsTo customer, MANY2ONE)(4)
+      - TO tenant( service-subscription Uses tenant, MANY2MANY)
+      - FROM service-instance( service-instance BelongsTo service-subscription, MANY2ONE)(1)
+
+      -(1) IF this SERVICE-SUBSCRIPTION node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this SERVICE-SUBSCRIPTION is DELETED also
     required:
     - service-type
     properties:
@@ -62136,9 +55978,11 @@ patchDefinitions:
   site-pair:
     description: |
       ###### Related Nodes
-      - TO routing-instance( site-pair org.onap.relationships.inventory.BelongsTo routing-instance, MANY2ONE)
-      - FROM class-of-service( class-of-service org.onap.relationships.inventory.BelongsTo site-pair, MANY2ONE)
-      - SITE-PAIR is DELETED when these are DELETED CLASS-OF-SERVICE
+      - TO routing-instance( site-pair BelongsTo routing-instance, MANY2ONE)(4)
+      - FROM class-of-service( class-of-service BelongsTo site-pair, MANY2ONE)(1)
+
+      -(1) IF this SITE-PAIR node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this SITE-PAIR is DELETED also
     required:
     - site-pair-id
     properties:
@@ -62164,9 +56008,10 @@ patchDefinitions:
     description: |
       Set of instances for probes used to measure service level agreements
       ###### Related Nodes
-      - TO generic-vnf( site-pair-set org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
-      - FROM routing-instance( routing-instance org.onap.relationships.inventory.BelongsTo site-pair-set, MANY2ONE)
-      - SITE-PAIR-SET is DELETED when these are DELETED ROUTING-INSTANCE
+      - TO generic-vnf( site-pair-set AppliesTo generic-vnf, MANY2MANY)
+      - FROM routing-instance( routing-instance BelongsTo site-pair-set, MANY2ONE)(1)
+
+      -(1) IF this SITE-PAIR-SET node is deleted, this FROM node is DELETED also
     required:
     - site-pair-set-id
     properties:
@@ -62193,8 +56038,9 @@ patchDefinitions:
     description: |
       Openstack snapshot
       ###### Related Nodes
-      - TO cloud-region( snapshot org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vserver( vserver org.onap.relationships.inventory.Uses snapshot, ONE2ONE)
+      - TO cloud-region( snapshot BelongsTo cloud-region, MANY2ONE)
+      - FROM vserver( vserver Uses snapshot, ONE2ONE)
+
     required:
     - snapshot-id
     properties:
@@ -62240,8 +56086,10 @@ patchDefinitions:
     description: |
       SR-IOV Physical Function
       ###### Related Nodes
-      - TO p-interface( sriov-pf org.onap.relationships.inventory.BelongsTo p-interface, ONE2ONE)
-      - FROM sriov-vf( sriov-vf org.onap.relationships.inventory.Uses sriov-pf, MANY2ONE)
+      - TO p-interface( sriov-pf BelongsTo p-interface, ONE2ONE)(4)
+      - FROM sriov-vf( sriov-vf Uses sriov-pf, MANY2ONE)
+
+      -(4) IF this TO node is deleted, this SRIOV-PF is DELETED also
     required:
     - pf-pci-id
     properties:
@@ -62260,8 +56108,10 @@ patchDefinitions:
     description: |
       SR-IOV Virtual Function (not to be confused with virtual network function)
       ###### Related Nodes
-      - TO l-interface( sriov-vf org.onap.relationships.inventory.BelongsTo l-interface, ONE2ONE)
-      - TO sriov-pf( sriov-vf org.onap.relationships.inventory.Uses sriov-pf, MANY2ONE)
+      - TO l-interface( sriov-vf BelongsTo l-interface, ONE2ONE)(4)
+      - TO sriov-pf( sriov-vf Uses sriov-pf, MANY2ONE)
+
+      -(4) IF this TO node is deleted, this SRIOV-VF is DELETED also
     required:
     - pci-id
     properties:
@@ -62318,14 +56168,17 @@ patchDefinitions:
   subnet:
     description: |
       ###### Related Nodes
-      - TO l3-network( subnet org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - FROM host-route( host-route org.onap.relationships.inventory.BelongsTo subnet, MANY2ONE)
-      - FROM vip-ipv4-address-list( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - FROM vip-ipv6-address-list( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - SUBNET cannot be deleted if linked to L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST
-      - SUBNET is DELETED when these are DELETED HOST-ROUTE
+      - TO l3-network( subnet BelongsTo l3-network, MANY2ONE)(4)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list MemberOf subnet, MANY2MANY)
+      - FROM host-route( host-route BelongsTo subnet, MANY2ONE)(1)
+      - FROM vip-ipv4-address-list( vip-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - FROM vip-ipv6-address-list( vip-ipv6-address-list MemberOf subnet, MANY2MANY)
+
+      -(1) IF this SUBNET node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this SUBNET is DELETED also
+      -SUBNET cannot be deleted if related to L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST
+
     required:
     - subnet-id
     - dhcp-enabled
@@ -62356,6 +56209,7 @@ patchDefinitions:
         description: Orchestration status of this VNF, mastered by MSO
       dhcp-enabled:
         type: boolean
+        description: dhcp enabled
       dhcp-start:
         type: string
         description: the start address reserved for use by dhcp
@@ -62384,13 +56238,15 @@ patchDefinitions:
     description: |
       Openstack tenant
       ###### Related Nodes
-      - TO cloud-region( tenant org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO group-assignment( tenant org.onap.relationships.inventory.MemberOf group-assignment, MANY2MANY)
-      - TO l3-network( tenant org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - TO volume-group( tenant org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
-      - FROM service-subscription( service-subscription org.onap.relationships.inventory.Uses tenant, MANY2MANY)
-      - FROM vserver( vserver org.onap.relationships.inventory.BelongsTo tenant, MANY2ONE)
-      - TENANT cannot be deleted if linked to VSERVER
+      - TO cloud-region( tenant BelongsTo cloud-region, MANY2ONE)
+      - TO group-assignment( tenant MemberOf group-assignment, MANY2MANY)
+      - TO l3-network( tenant Uses l3-network, MANY2MANY)
+      - TO volume-group( tenant DependsOn volume-group, ONE2MANY)
+      - FROM service-subscription( service-subscription Uses tenant, MANY2MANY)
+      - FROM vserver( vserver BelongsTo tenant, MANY2ONE)
+
+      -TENANT cannot be deleted if related to VSERVER
+
     required:
     - tenant-id
     - tenant-name
@@ -62416,7 +56272,9 @@ patchDefinitions:
     description: |
       Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted
       ###### Related Nodes
-      - TO allotted-resource( tunnel-xconnect org.onap.relationships.inventory.BelongsTo allotted-resource, ONE2ONE)
+      - TO allotted-resource( tunnel-xconnect BelongsTo allotted-resource, ONE2ONE)(4)
+
+      -(4) IF this TO node is deleted, this TUNNEL-XCONNECT is DELETED also
     required:
     - id
     properties:
@@ -62471,14 +56329,15 @@ patchDefinitions:
     description: |
       Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.
       ###### Related Nodes
-      - TO availability-zone( vce org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - TO complex( vce org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - TO vserver( vce tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM entitlement( entitlement org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM license( license org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM port-group( port-group org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf vce, ONE2MANY)
-      - VCE is DELETED when these are DELETED ENTITLEMENT,LICENSE,PORT-GROUP
+      - TO availability-zone( vce Uses availability-zone, MANY2MANY)
+      - TO complex( vce LocatedIn complex, MANY2MANY)
+      - TO vserver( vce HostedOn vserver, ONE2MANY)
+      - FROM entitlement( entitlement BelongsTo vce, MANY2ONE)(1)
+      - FROM license( license BelongsTo vce, MANY2ONE)(1)
+      - FROM port-group( port-group BelongsTo vce, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf vce, ONE2MANY)
+
+      -(1) IF this VCE node is deleted, this FROM node is DELETED also
     required:
     - vnf-id
     - vnf-name
@@ -62544,13 +56403,16 @@ patchDefinitions:
     description: |
       a deployment unit of VNFCs
       ###### Related Nodes
-      - TO generic-vnf( vf-module org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO l3-network( vf-module org.onap.relationships.inventory.DependsOn l3-network, MANY2MANY)
-      - TO vnfc( vf-module org.onap.relationships.inventory.Uses vnfc, ONE2MANY)
-      - TO volume-group( vf-module org.onap.relationships.inventory.Uses volume-group, ONE2ONE)
-      - TO vserver( vf-module org.onap.relationships.inventory.Uses vserver, ONE2MANY)
-      - TO model-ver( vf-module org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - VF-MODULE cannot be deleted if linked to VNFC
+      - TO generic-vnf( vf-module BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO l3-network( vf-module DependsOn l3-network, MANY2MANY)
+      - TO vnfc( vf-module Uses vnfc, ONE2MANY)
+      - TO volume-group( vf-module Uses volume-group, ONE2ONE)
+      - TO vserver( vf-module Uses vserver, ONE2MANY)
+      - TO model-ver( vf-module IsA model-ver, Many2One)
+
+      -(4) IF this TO node is deleted, this VF-MODULE is DELETED also
+      -VF-MODULE cannot be deleted if related to VNFC
+
     required:
     - vf-module-id
     - is-base-vf-module
@@ -62569,6 +56431,7 @@ patchDefinitions:
         description: orchestration status of this vf-module, mastered by MSO
       is-base-vf-module:
         type: boolean
+        description: used to indicate whether or not this object is base vf module
   vf-modules:
     description: |
       Collection of vf-modules, a deployment unit of VNFCs
@@ -62581,7 +56444,9 @@ patchDefinitions:
     description: |
       vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607
       ###### Related Nodes
-      - TO ipsec-configuration( vig-server org.onap.relationships.inventory.BelongsTo ipsec-configuration, MANY2ONE)
+      - TO ipsec-configuration( vig-server BelongsTo ipsec-configuration, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this VIG-SERVER is DELETED also
     required:
     - vig-address-type
     properties:
@@ -62604,10 +56469,11 @@ patchDefinitions:
     description: |
       IPv4 Address Range
       ###### Related Nodes
-      - TO cloud-region( vip-ipv4-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO instance-group( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO subnet( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.Uses vip-ipv4-address-list, MANY2MANY)
+      - TO cloud-region( vip-ipv4-address-list BelongsTo cloud-region, MANY2ONE)
+      - TO instance-group( vip-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - TO subnet( vip-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - FROM vnfc( vnfc Uses vip-ipv4-address-list, MANY2MANY)
+
     required:
     - vip-ipv4-address
     properties:
@@ -62633,10 +56499,11 @@ patchDefinitions:
     description: |
       IPv6 Address Range
       ###### Related Nodes
-      - TO cloud-region( vip-ipv6-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO instance-group( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO subnet( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.Uses vip-ipv6-address-list, MANY2MANY)
+      - TO cloud-region( vip-ipv6-address-list BelongsTo cloud-region, MANY2ONE)
+      - TO instance-group( vip-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - TO subnet( vip-ipv6-address-list MemberOf subnet, MANY2MANY)
+      - FROM vnfc( vnfc Uses vip-ipv6-address-list, MANY2MANY)
+
     required:
     - vip-ipv6-address
     properties:
@@ -62662,9 +56529,10 @@ patchDefinitions:
     description: |
       Virtual organization of cloud infrastructure elements in a data center context
       ###### Related Nodes
-      - FROM connector( connector org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
+      - FROM connector( connector LocatedIn virtual-data-center, MANY2MANY)
+      - FROM generic-vnf( generic-vnf LocatedIn virtual-data-center, MANY2MANY)
+      - FROM logical-link( logical-link LocatedIn virtual-data-center, MANY2MANY)
+
     required:
     - vdc-id
     - vdc-name
@@ -62687,15 +56555,17 @@ patchDefinitions:
     description: |
       Definition of vlan
       ###### Related Nodes
-      - TO l-interface( vlan tosca.relationships.network.LinksTo l-interface, MANY2ONE)
-      - TO logical-link( vlan org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - TO multicast-configuration( vlan org.onap.relationships.inventory.Uses multicast-configuration, MANY2MANY)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.PartOf vlan, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf vlan, ONE2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - VLAN is DELETED when these are DELETED L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST
-      - VLAN deletion means associated objects of these types are also DELETED:LOGICAL-LINK
+      - TO l-interface( vlan LinksTo l-interface, MANY2ONE)(4)
+      - TO logical-link( vlan Uses logical-link, MANY2MANY)(2)
+      - TO multicast-configuration( vlan Uses multicast-configuration, MANY2MANY)
+      - FROM allotted-resource( allotted-resource PartOf vlan, MANY2MANY)
+      - FROM service-instance( service-instance ComposedOf vlan, ONE2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list BelongsTo vlan, MANY2ONE)(1)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list BelongsTo vlan, MANY2ONE)(1)
+
+      -(1) IF this VLAN node is deleted, this FROM node is DELETED also
+      -(2) IF this VLAN node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this VLAN is DELETED also
     required:
     - vlan-interface
     - in-maint
@@ -62731,8 +56601,10 @@ patchDefinitions:
     description: |
       Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.
       ###### Related Nodes
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses vnf-image, MANY2ONE)
-      - VNF-IMAGE cannot be deleted if linked to GENERIC-VNF
+      - FROM generic-vnf( generic-vnf Uses vnf-image, MANY2ONE)
+
+      -VNF-IMAGE cannot be deleted if related to GENERIC-VNF
+
     required:
     - vnf-image-uuid
     - application
@@ -62764,15 +56636,17 @@ patchDefinitions:
   vnfc:
     description: |
       ###### Related Nodes
-      - TO generic-vnf( vnfc org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO instance-group( vnfc org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO vip-ipv4-address-list( vnfc org.onap.relationships.inventory.Uses vip-ipv4-address-list, MANY2MANY)
-      - TO vip-ipv6-address-list( vnfc org.onap.relationships.inventory.Uses vip-ipv6-address-list, MANY2MANY)
-      - TO vserver( vnfc tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.Uses vnfc, ONE2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
-      - VNFC is DELETED when these are DELETED L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST
+      - TO generic-vnf( vnfc BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO instance-group( vnfc MemberOf instance-group, MANY2MANY)
+      - TO vip-ipv4-address-list( vnfc Uses vip-ipv4-address-list, MANY2MANY)
+      - TO vip-ipv6-address-list( vnfc Uses vip-ipv6-address-list, MANY2MANY)
+      - TO vserver( vnfc HostedOn vserver, ONE2MANY)
+      - FROM vf-module( vf-module Uses vnfc, ONE2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list BelongsTo vnfc, MANY2ONE)(1)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list BelongsTo vnfc, MANY2ONE)(1)
+
+      -(1) IF this VNFC node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this VNFC is DELETED also
     required:
     - vnfc-name
     - nfc-naming-code
@@ -62800,8 +56674,10 @@ patchDefinitions:
         description: Oam V4 vip address of this vnfc
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       is-closed-loop-disabled:
         type: boolean
+        description: used to indicate whether closed loop function is enabled on this node
       group-notation:
         type: string
         description: Group notation of VNFC
@@ -62823,7 +56699,9 @@ patchDefinitions:
     description: |
       Ephemeral Block storage volume.
       ###### Related Nodes
-      - FROM vserver (PARENT of volume, vserver tosca.relationships.AttachesTo volume)
+      - FROM vserver (PARENT of volume, vserver AttachesTo volume)(3)
+
+      -(3) IF this FROM node is deleted, this VOLUME is DELETED also
     required:
     - volume-id
     - volume-selflink
@@ -62838,11 +56716,12 @@ patchDefinitions:
     description: |
       Persistent block-level storage.
       ###### Related Nodes
-      - TO cloud-region( volume-group org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO complex( volume-group org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.Uses volume-group, ONE2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
+      - TO cloud-region( volume-group BelongsTo cloud-region, MANY2ONE)
+      - TO complex( volume-group LocatedIn complex, MANY2ONE)
+      - FROM generic-vnf( generic-vnf DependsOn volume-group, ONE2MANY)
+      - FROM vf-module( vf-module Uses volume-group, ONE2ONE)
+      - FROM tenant( tenant DependsOn volume-group, ONE2MANY)
+
     required:
     - volume-group-id
     - volume-group-name
@@ -62889,11 +56768,12 @@ patchDefinitions:
     description: |
       VPLS Provider Edge routers.
       ###### Related Nodes
-      - TO complex( vpls-pe org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO ctag-pool( vpls-pe org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
-      - FROM lag-interface( lag-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - FROM p-interface( p-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - VPLS-PE is DELETED when these are DELETED LAG-INTERFACE,P-INTERFACE
+      - TO complex( vpls-pe LocatedIn complex, MANY2ONE)
+      - TO ctag-pool( vpls-pe Uses ctag-pool, MANY2MANY)
+      - FROM lag-interface( lag-interface BindsTo vpls-pe, MANY2ONE)(1)
+      - FROM p-interface( p-interface BindsTo vpls-pe, MANY2ONE)(1)
+
+      -(1) IF this VPLS-PE node is deleted, this FROM node is DELETED also
     required:
     - equipment-name
     properties:
@@ -62924,12 +56804,14 @@ patchDefinitions:
     description: |
       VPN binding
       ###### Related Nodes
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2MANY)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - FROM route-target( route-target org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2ONE)
-      - VPN-BINDING cannot be deleted if linked to ALLOTTED-RESOURCE,L3-NETWORK,LOGICAL-LINK
-      - VPN-BINDING is DELETED when these are DELETED ROUTE-TARGET
+      - FROM allotted-resource( allotted-resource BelongsTo vpn-binding, MANY2MANY)
+      - FROM l3-network( l3-network Uses vpn-binding, MANY2MANY)
+      - FROM logical-link( logical-link Uses vpn-binding, MANY2MANY)
+      - FROM route-target( route-target BelongsTo vpn-binding, MANY2ONE)(1)
+
+      -(1) IF this VPN-BINDING node is deleted, this FROM node is DELETED also
+      -VPN-BINDING cannot be deleted if related to ALLOTTED-RESOURCE,L3-NETWORK,LOGICAL-LINK
+
     required:
     - vpn-id
     - vpn-name
@@ -62965,19 +56847,20 @@ patchDefinitions:
     description: |
       Virtual Servers, aka virtual machine or VM.
       ###### Related Nodes
-      - TO tenant( vserver org.onap.relationships.inventory.BelongsTo tenant, MANY2ONE)
-      - TO flavor( vserver org.onap.relationships.inventory.Uses flavor, MANY2ONE)
-      - TO image( vserver org.onap.relationships.inventory.Uses image, MANY2ONE)
-      - TO pserver( vserver tosca.relationships.HostedOn pserver, MANY2ONE)
-      - TO snapshot( vserver org.onap.relationships.inventory.Uses snapshot, ONE2ONE)
-      - TO volume (CHILD of vserver, vserver tosca.relationships.AttachesTo volume, ONE2MANY)
-      - FROM generic-vnf( generic-vnf tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM vce( vce tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM l-interface( l-interface tosca.relationships.network.BindsTo vserver, MANY2ONE)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.Uses vserver, ONE2MANY)
-      - FROM vnfc( vnfc tosca.relationships.HostedOn vserver, ONE2MANY)
-      - VSERVER is DELETED when these are DELETED L-INTERFACE
-      - VSERVER deletion means associated objects of these types are also DELETED:VOLUME
+      - TO tenant( vserver BelongsTo tenant, MANY2ONE)
+      - TO flavor( vserver Uses flavor, MANY2ONE)
+      - TO image( vserver Uses image, MANY2ONE)
+      - TO pserver( vserver HostedOn pserver, MANY2ONE)
+      - TO snapshot( vserver Uses snapshot, ONE2ONE)
+      - TO volume (CHILD of vserver, vserver AttachesTo volume, ONE2MANY)(2)
+      - FROM generic-vnf( generic-vnf HostedOn vserver, ONE2MANY)
+      - FROM vce( vce HostedOn vserver, ONE2MANY)
+      - FROM l-interface( l-interface BindsTo vserver, MANY2ONE)(1)
+      - FROM vf-module( vf-module Uses vserver, ONE2MANY)
+      - FROM vnfc( vnfc HostedOn vserver, ONE2MANY)
+
+      -(1) IF this VSERVER node is deleted, this FROM node is DELETED also
+      -(2) IF this VSERVER node is deleted, this TO node is DELETED also
     required:
     - vserver-id
     - vserver-name
@@ -63002,8 +56885,10 @@ patchDefinitions:
         description: URL to endpoint where AAI can get more details
       in-maint:
         type: boolean
+        description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       is-closed-loop-disabled:
         type: boolean
+        description: Used to indicate whether closed loop function is enabled on this node
   vservers:
     description: |
       Collection of virtual Servers, aka virtual machines or VMs.
@@ -63016,11 +56901,12 @@ patchDefinitions:
     description: |
       A zone is a grouping of assets in a location homing to the same connections into the CBB
       ###### Related Nodes
-      - TO complex( zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM cloud-region( cloud-region org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM pnf( pnf org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM pserver( pserver org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
+      - TO complex( zone LocatedIn complex, MANY2ONE)
+      - FROM cloud-region( cloud-region LocatedIn zone, MANY2ONE)
+      - FROM pnf( pnf LocatedIn zone, MANY2ONE)
+      - FROM pserver( pserver LocatedIn zone, MANY2ONE)
+      - FROM service-instance( service-instance LocatedIn zone, MANY2ONE)
+
     required:
     - zone-id
     - zone-name
@@ -63051,12 +56937,6 @@ patchDefinitions:
         items:          
           $ref: "#/patchDefinitions/zone"
 getDefinitions:
-  aai-internal:
-    properties:
-      property-name:
-        type: string
-      property-value:
-        type: string
   action:
     properties:
       action-type:
@@ -63085,21 +56965,24 @@ getDefinitions:
     description: |
       Represents a slice or partial piece of a resource that gets separately allotted
       ###### Related Nodes
-      - TO allotted-resource( allotted-resource tosca.relationships.network.BindsTo allotted-resource, ONE2ONE)
-      - TO generic-vnf( allotted-resource org.onap.relationships.inventory.PartOf generic-vnf, MANY2MANY)
-      - TO instance-group( allotted-resource org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO l3-network( allotted-resource org.onap.relationships.inventory.PartOf l3-network, MANY2MANY)
-      - TO l-interface( allotted-resource org.onap.relationships.inventory.Uses l-interface, ONE2MANY)
-      - TO network-policy( allotted-resource org.onap.relationships.inventory.Uses network-policy, ONE2ONE)
-      - TO vlan( allotted-resource org.onap.relationships.inventory.PartOf vlan, MANY2MANY)
-      - TO vpn-binding( allotted-resource org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2MANY)
-      - TO service-instance( allotted-resource org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
-      - TO model-ver( allotted-resource org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM tunnel-xconnect( tunnel-xconnect org.onap.relationships.inventory.BelongsTo allotted-resource, ONE2ONE)
-      - FROM configuration( configuration org.onap.relationships.inventory.Uses allotted-resource, ONE2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses allotted-resource, MANY2MANY)
-      - FROM allotted-resource( allotted-resource tosca.relationships.network.BindsTo allotted-resource, ONE2ONE)
-      - ALLOTTED-RESOURCE is DELETED when these are DELETED TUNNEL-XCONNECT
+      - TO allotted-resource( allotted-resource BindsTo allotted-resource, ONE2ONE)
+      - TO generic-vnf( allotted-resource PartOf generic-vnf, MANY2MANY)
+      - TO instance-group( allotted-resource MemberOf instance-group, MANY2MANY)
+      - TO l3-network( allotted-resource PartOf l3-network, MANY2MANY)
+      - TO l-interface( allotted-resource Uses l-interface, ONE2MANY)
+      - TO network-policy( allotted-resource Uses network-policy, ONE2ONE)
+      - TO vlan( allotted-resource PartOf vlan, MANY2MANY)
+      - TO vpn-binding( allotted-resource BelongsTo vpn-binding, MANY2MANY)
+      - TO service-instance( allotted-resource BelongsTo service-instance, MANY2ONE)(4)
+      - TO model-ver( allotted-resource IsA model-ver, Many2One)
+      - FROM tunnel-xconnect( tunnel-xconnect BelongsTo allotted-resource, ONE2ONE)(1)
+      - FROM configuration( configuration Uses allotted-resource, ONE2ONE)(3)
+      - FROM service-instance( service-instance Uses allotted-resource, MANY2MANY)
+      - FROM allotted-resource( allotted-resource BindsTo allotted-resource, ONE2ONE)
+
+      -(1) IF this ALLOTTED-RESOURCE node is deleted, this FROM node is DELETED also
+      -(3) IF this FROM node is deleted, this ALLOTTED-RESOURCE is DELETED also
+      -(4) IF this TO node is deleted, this ALLOTTED-RESOURCE is DELETED also
     required:
     - id
     properties:
@@ -63156,15 +57039,18 @@ getDefinitions:
     description: |
       Availability zone, a collection of compute hosts/pservers
       ###### Related Nodes
-      - TO complex( availability-zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO service-capability( availability-zone org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
-      - TO cloud-region( availability-zone org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM ctag-pool( ctag-pool org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
-      - FROM dvs-switch( dvs-switch org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - FROM pserver( pserver org.onap.relationships.inventory.MemberOf availability-zone, MANY2ONE)
-      - FROM vce( vce org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - AVAILABILITY-ZONE cannot be deleted if linked to CTAG-POOL,DVS-SWITCH,GENERIC-VNF,PSERVER,VCE
+      - TO complex( availability-zone LocatedIn complex, MANY2ONE)
+      - TO service-capability( availability-zone AppliesTo service-capability, MANY2MANY)
+      - TO cloud-region( availability-zone BelongsTo cloud-region, MANY2ONE)(4)
+      - FROM ctag-pool( ctag-pool AppliesTo availability-zone, MANY2MANY)
+      - FROM dvs-switch( dvs-switch AppliesTo availability-zone, MANY2MANY)
+      - FROM generic-vnf( generic-vnf Uses availability-zone, MANY2MANY)
+      - FROM pserver( pserver MemberOf availability-zone, MANY2ONE)
+      - FROM vce( vce Uses availability-zone, MANY2MANY)
+
+      -(4) IF this TO node is deleted, this AVAILABILITY-ZONE is DELETED also
+      -AVAILABILITY-ZONE cannot be deleted if related to CTAG-POOL,DVS-SWITCH,GENERIC-VNF,PSERVER,VCE
+
     required:
     - availability-zone-name
     - hypervisor-type
@@ -63232,7 +57118,9 @@ getDefinitions:
   class-of-service:
     description: |
       ###### Related Nodes
-      - TO site-pair( class-of-service org.onap.relationships.inventory.BelongsTo site-pair, MANY2ONE)
+      - TO site-pair( class-of-service BelongsTo site-pair, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this CLASS-OF-SERVICE is DELETED also
     required:
     - cos
     properties:
@@ -63292,26 +57180,28 @@ getDefinitions:
     description: |
       cloud-region designates an installation of a cloud cluster or region or instantiation.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of cloud-region, cloud-region has esr-system-info, One2Many)
-      - TO complex( cloud-region org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO l3-network( cloud-region org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - TO zone( cloud-region org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM availability-zone( availability-zone org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM dvs-switch( dvs-switch org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM flavor( flavor org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM group-assignment( group-assignment org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM image( image org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM oam-network( oam-network org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM snapshot( snapshot org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vip-ipv4-address-list( vip-ipv4-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vip-ipv6-address-list( vip-ipv6-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM volume-group( volume-group org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.LocatedIn cloud-region, MANY2MANY)
-      - FROM pserver( pserver org.onap.relationships.inventory.LocatedIn cloud-region, MANY2ONE)
-      - CLOUD-REGION cannot be deleted if linked to DVS-SWITCH,FLAVOR,GROUP-ASSIGNMENT,IMAGE,OAM-NETWORK,SNAPSHOT,TENANT,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST,VOLUME-GROUP
-      - CLOUD-REGION is DELETED when these are DELETED AVAILABILITY-ZONE
-      - CLOUD-REGION deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - TO complex( cloud-region LocatedIn complex, MANY2ONE)
+      - TO l3-network( cloud-region Uses l3-network, MANY2MANY)
+      - TO zone( cloud-region LocatedIn zone, MANY2ONE)
+      - FROM esr-system-info( esr-system-info BelongsTo cloud-region, MANY2ONE)(1)
+      - FROM availability-zone( availability-zone BelongsTo cloud-region, MANY2ONE)(1)
+      - FROM dvs-switch( dvs-switch BelongsTo cloud-region, MANY2ONE)
+      - FROM flavor( flavor BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-capability( hpa-capability BelongsTo cloud-region, MANY2ONE)
+      - FROM group-assignment( group-assignment BelongsTo cloud-region, MANY2ONE)
+      - FROM image( image BelongsTo cloud-region, MANY2ONE)
+      - FROM oam-network( oam-network BelongsTo cloud-region, MANY2ONE)
+      - FROM snapshot( snapshot BelongsTo cloud-region, MANY2ONE)
+      - FROM tenant( tenant BelongsTo cloud-region, MANY2ONE)
+      - FROM vip-ipv4-address-list( vip-ipv4-address-list BelongsTo cloud-region, MANY2ONE)
+      - FROM vip-ipv6-address-list( vip-ipv6-address-list BelongsTo cloud-region, MANY2ONE)
+      - FROM volume-group( volume-group BelongsTo cloud-region, MANY2ONE)
+      - FROM logical-link( logical-link LocatedIn cloud-region, MANY2MANY)
+      - FROM pserver( pserver LocatedIn cloud-region, MANY2ONE)
+
+      -(1) IF this CLOUD-REGION node is deleted, this FROM node is DELETED also
+      -CLOUD-REGION cannot be deleted if related to DVS-SWITCH,FLAVOR,HPA-CAPABILITY,GROUP-ASSIGNMENT,IMAGE,OAM-NETWORK,SNAPSHOT,TENANT,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST,VOLUME-GROUP
+
     required:
     - cloud-owner
     - cloud-region-id
@@ -63343,6 +57233,7 @@ getDefinitions:
         description: complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.
       sriov-automation:
         type: boolean
+        description: Whether the cloud region supports (true) or does not support (false) SR-IOV automation.
       cloud-extra-info:
         type: string
         description: ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM.
@@ -63400,6 +57291,11 @@ getDefinitions:
         type: array
         items:          
           $ref: "#/getDefinitions/vip-ipv6-address-list"
+      hpa-capabilities:
+        type: array
+        items:
+          $ref: "#/getDefinitions/hpa-capability"
+        description: List of cloud-region specific HPA Capabilities
   cloud-regions:
     properties:
       cloud-region:
@@ -63410,20 +57306,22 @@ getDefinitions:
     description: |
       Collection of physical locations that can house cloud-regions.
       ###### Related Nodes
-      - TO l3-network( complex org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM availability-zone( availability-zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM cloud-region( cloud-region org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM ctag-pool( ctag-pool org.onap.relationships.inventory.BelongsTo complex, MANY2ONE)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - FROM oam-network( oam-network org.onap.relationships.inventory.AppliesTo complex, MANY2MANY)
-      - FROM pnf( pnf org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM pserver( pserver org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM vce( vce org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - FROM volume-group( volume-group org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM vpls-pe( vpls-pe org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM zone( zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - COMPLEX cannot be deleted if linked to AVAILABILITY-ZONE,CLOUD-REGION,GENERIC-VNF,OAM-NETWORK,PNF,PSERVER,VCE,VOLUME-GROUP,VPLS-PE,ZONE
-      - COMPLEX is DELETED when these are DELETED CTAG-POOL
+      - TO l3-network( complex Uses l3-network, MANY2MANY)
+      - FROM availability-zone( availability-zone LocatedIn complex, MANY2ONE)
+      - FROM cloud-region( cloud-region LocatedIn complex, MANY2ONE)
+      - FROM ctag-pool( ctag-pool BelongsTo complex, MANY2ONE)(1)
+      - FROM generic-vnf( generic-vnf LocatedIn complex, MANY2MANY)
+      - FROM oam-network( oam-network AppliesTo complex, MANY2MANY)
+      - FROM pnf( pnf LocatedIn complex, MANY2ONE)
+      - FROM pserver( pserver LocatedIn complex, MANY2ONE)
+      - FROM vce( vce LocatedIn complex, MANY2MANY)
+      - FROM volume-group( volume-group LocatedIn complex, MANY2ONE)
+      - FROM vpls-pe( vpls-pe LocatedIn complex, MANY2ONE)
+      - FROM zone( zone LocatedIn complex, MANY2ONE)
+
+      -(1) IF this COMPLEX node is deleted, this FROM node is DELETED also
+      -COMPLEX cannot be deleted if related to AVAILABILITY-ZONE,CLOUD-REGION,GENERIC-VNF,OAM-NETWORK,PNF,PSERVER,VCE,VOLUME-GROUP,VPLS-PE,ZONE
+
     required:
     - physical-location-id
     - physical-location-type
@@ -63493,19 +57391,21 @@ getDefinitions:
     description: |
       Port Mirror Configuration.
       ###### Related Nodes
-      - TO allotted-resource( configuration org.onap.relationships.inventory.Uses allotted-resource, ONE2ONE)
-      - TO logical-link( configuration org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - TO l-interface( configuration org.onap.relationships.inventory.AppliesTo l-interface, ONE2MANY)
-      - TO pnf( configuration org.onap.relationships.inventory.AppliesTo pnf, ONE2MANY)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo configuration, MANY2ONE)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - FROM forwarding-path( forwarding-path org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - FROM evc( evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
-      - FROM forwarder-evc( forwarder-evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
-      - CONFIGURATION is DELETED when these are DELETED METADATUM,EVC,FORWARDER-EVC
-      - CONFIGURATION deletion means associated objects of these types are also DELETED:ALLOTTED-RESOURCE,LOGICAL-LINK
+      - TO allotted-resource( configuration Uses allotted-resource, ONE2ONE)(2)
+      - TO logical-link( configuration Uses logical-link, ONE2MANY)(2)
+      - TO l-interface( configuration AppliesTo l-interface, ONE2MANY)
+      - TO pnf( configuration AppliesTo pnf, ONE2MANY)
+      - FROM metadatum( metadatum BelongsTo configuration, MANY2ONE)(1)
+      - FROM generic-vnf( generic-vnf Uses configuration, ONE2MANY)(3)
+      - FROM service-instance( service-instance Uses configuration, ONE2MANY)
+      - FROM forwarder( forwarder Uses configuration, ONE2ONE)(3)
+      - FROM forwarding-path( forwarding-path Uses configuration, ONE2ONE)(3)
+      - FROM evc( evc BelongsTo configuration, ONE2ONE)(1)
+      - FROM forwarder-evc( forwarder-evc BelongsTo configuration, ONE2ONE)(1)
+
+      -(1) IF this CONFIGURATION node is deleted, this FROM node is DELETED also
+      -(2) IF this CONFIGURATION node is deleted, this TO node is DELETED also
+      -(3) IF this FROM node is deleted, this CONFIGURATION is DELETED also
     required:
     - configuration-id
     - configuration-type
@@ -63585,10 +57485,11 @@ getDefinitions:
     description: |
       Collection of resource instances used to connect a variety of disparate inventory widgets
       ###### Related Nodes
-      - TO virtual-data-center( connector org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo connector, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses connector, MANY2MANY)
-      - CONNECTOR is DELETED when these are DELETED METADATUM
+      - TO virtual-data-center( connector LocatedIn virtual-data-center, MANY2MANY)
+      - FROM metadatum( metadatum BelongsTo connector, MANY2ONE)(1)
+      - FROM service-instance( service-instance Uses connector, MANY2MANY)
+
+      -(1) IF this CONNECTOR node is deleted, this FROM node is DELETED also
     required:
     - resource-instance-id
     properties:
@@ -63633,10 +57534,12 @@ getDefinitions:
     description: |
       This is how we would capture constraints defining allowed sets of elements.
       ###### Related Nodes
-      - TO model-constraint( constrained-element-set org.onap.relationships.inventory.BelongsTo model-constraint, MANY2ONE)
-      - TO model-element( constrained-element-set org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM element-choice-set( element-choice-set org.onap.relationships.inventory.BelongsTo constrained-element-set, MANY2ONE)
-      - CONSTRAINED-ELEMENT-SET is DELETED when these are DELETED ELEMENT-CHOICE-SET
+      - TO model-constraint( constrained-element-set BelongsTo model-constraint, MANY2ONE)(4)
+      - TO model-element( constrained-element-set BelongsTo model-element, MANY2ONE)(4)
+      - FROM element-choice-set( element-choice-set BelongsTo constrained-element-set, MANY2ONE)(1)
+
+      -(1) IF this CONSTRAINED-ELEMENT-SET node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this CONSTRAINED-ELEMENT-SET is DELETED also
     required:
     - constrained-element-set-uuid
     - constraint-type
@@ -63667,8 +57570,10 @@ getDefinitions:
   ctag-assignment:
     description: |
       ###### Related Nodes
-      - TO l3-network( ctag-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses ctag-assignment, ONE2MANY)
+      - TO l3-network( ctag-assignment BelongsTo l3-network, MANY2ONE)(4)
+      - FROM service-instance( service-instance Uses ctag-assignment, ONE2MANY)
+
+      -(4) IF this TO node is deleted, this CTAG-ASSIGNMENT is DELETED also
     required:
     - vlan-id-inner
     properties:
@@ -63693,10 +57598,12 @@ getDefinitions:
     description: |
       A collection of C tags (vlan tags) grouped for a specific purpose.
       ###### Related Nodes
-      - TO complex( ctag-pool org.onap.relationships.inventory.BelongsTo complex, MANY2ONE)
-      - TO availability-zone( ctag-pool org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
-      - FROM vpls-pe( vpls-pe org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
+      - TO complex( ctag-pool BelongsTo complex, MANY2ONE)(4)
+      - TO availability-zone( ctag-pool AppliesTo availability-zone, MANY2MANY)
+      - FROM generic-vnf( generic-vnf Uses ctag-pool, MANY2MANY)
+      - FROM vpls-pe( vpls-pe Uses ctag-pool, MANY2MANY)
+
+      -(4) IF this TO node is deleted, this CTAG-POOL is DELETED also
     required:
     - target-pe
     - availability-zone-name
@@ -63731,8 +57638,9 @@ getDefinitions:
     description: |
       customer identifiers to provide linkage back to BSS information.
       ###### Related Nodes
-      - FROM service-subscription( service-subscription org.onap.relationships.inventory.BelongsTo customer, MANY2ONE)
-      - CUSTOMER is DELETED when these are DELETED SERVICE-SUBSCRIPTION
+      - FROM service-subscription( service-subscription BelongsTo customer, MANY2ONE)(1)
+
+      -(1) IF this CUSTOMER node is deleted, this FROM node is DELETED also
     required:
     - global-customer-id
     - subscriber-name
@@ -63791,8 +57699,9 @@ getDefinitions:
     description: |
       Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&AI. 
       ###### Related Nodes
-      - TO cloud-region( dvs-switch org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO availability-zone( dvs-switch org.onap.relationships.inventory.AppliesTo availability-zone, MANY2MANY)
+      - TO cloud-region( dvs-switch BelongsTo cloud-region, MANY2ONE)
+      - TO availability-zone( dvs-switch AppliesTo availability-zone, MANY2MANY)
+
     required:
     - switch-name
     - vcenter-url
@@ -63868,9 +57777,11 @@ getDefinitions:
     description: |
       This is how we would capture constraints defining allowed sets of elements.
       ###### Related Nodes
-      - TO constrained-element-set( element-choice-set org.onap.relationships.inventory.BelongsTo constrained-element-set, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.BelongsTo element-choice-set, MANY2ONE)
-      - ELEMENT-CHOICE-SET is DELETED when these are DELETED MODEL-ELEMENT
+      - TO constrained-element-set( element-choice-set BelongsTo constrained-element-set, MANY2ONE)(4)
+      - FROM model-element( model-element BelongsTo element-choice-set, MANY2ONE)(1)
+
+      -(1) IF this ELEMENT-CHOICE-SET node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this ELEMENT-CHOICE-SET is DELETED also
     required:
     - element-choice-set-uuid
     - element-choice-set-name
@@ -63901,8 +57812,10 @@ getDefinitions:
     description: |
       Metadata for entitlement group.
       ###### Related Nodes
-      - TO generic-vnf( entitlement org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO vce( entitlement org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
+      - TO generic-vnf( entitlement BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO vce( entitlement BelongsTo vce, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this ENTITLEMENT is DELETED also
     required:
     - group-uuid
     - resource-uuid
@@ -63932,8 +57845,9 @@ getDefinitions:
     description: |
       Persist EMS address information used by EMS driver.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of esr-ems, esr-ems has esr-system-info, One2Many)
-      - ESR-EMS deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - FROM esr-system-info( esr-system-info BelongsTo esr-ems, MANY2ONE)(1)
+
+      -(1) IF this ESR-EMS node is deleted, this FROM node is DELETED also
     required:
     - ems-id
     properties:
@@ -63959,10 +57873,12 @@ getDefinitions:
     description: |
       Persist common address information of external systems.
       ###### Related Nodes
-      - FROM esr-ems (PARENT of esr-system-info, esr-ems has esr-system-info)
-      - FROM esr-vnfm (PARENT of esr-system-info, esr-vnfm has esr-system-info)
-      - FROM esr-thirdparty-sdnc (PARENT of esr-system-info, esr-thirdparty-sdnc has esr-system-info)
-      - FROM cloud-region (PARENT of esr-system-info, cloud-region has esr-system-info)
+      - TO esr-ems( esr-system-info BelongsTo esr-ems, MANY2ONE)(4)
+      - TO esr-vnfm( esr-system-info BelongsTo esr-vnfm, ONE2ONE)(4)
+      - TO esr-thirdparty-sdnc( esr-system-info BelongsTo esr-thirdparty-sdnc, ONE2ONE)(4)
+      - TO cloud-region( esr-system-info BelongsTo cloud-region, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this ESR-SYSTEM-INFO is DELETED also
     required:
     - esr-system-info-id
     - user-name
@@ -64044,9 +57960,10 @@ getDefinitions:
     description: |
       Persist SDNC address information used by ONAP SDNC.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of esr-thirdparty-sdnc, esr-thirdparty-sdnc has esr-system-info, One2One)
-      - TO pnf( esr-thirdparty-sdnc has pnf, One2Many)
-      - ESR-THIRDPARTY-SDNC deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - TO pnf( esr-thirdparty-sdnc AppliesTo pnf, ONE2MANY)
+      - FROM esr-system-info( esr-system-info BelongsTo esr-thirdparty-sdnc, ONE2ONE)(1)
+
+      -(1) IF this ESR-THIRDPARTY-SDNC node is deleted, this FROM node is DELETED also
     required:
     - thirdparty-sdnc-id
     properties:
@@ -64078,8 +57995,9 @@ getDefinitions:
     description: |
       Persist VNFM address information used by VF-C.
       ###### Related Nodes
-      - TO esr-system-info (CHILD of esr-vnfm, esr-vnfm has esr-system-info, One2One)
-      - ESR-VNFM deletion means associated objects of these types are also DELETED:ESR-SYSTEM-INFO
+      - FROM esr-system-info( esr-system-info BelongsTo esr-vnfm, ONE2ONE)(1)
+
+      -(1) IF this ESR-VNFM node is deleted, this FROM node is DELETED also
     required:
     - vnfm-id
     properties:
@@ -64111,7 +58029,9 @@ getDefinitions:
     description: |
       evc object is an optional child object of the Configuration object.
       ###### Related Nodes
-      - TO configuration( evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
+      - TO configuration( evc BelongsTo configuration, ONE2ONE)(4)
+
+      -(4) IF this TO node is deleted, this EVC is DELETED also
     required:
     - evc-id
     properties:
@@ -64201,9 +58121,12 @@ getDefinitions:
     description: |
       Openstack flavor.
       ###### Related Nodes
-      - TO cloud-region( flavor org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vserver( vserver org.onap.relationships.inventory.Uses flavor, MANY2ONE)
-      - FLAVOR cannot be deleted if linked to VSERVER
+      - TO cloud-region( flavor BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-capability( hpa-capability BelongsTo flavor, MANY2ONE)
+      - FROM vserver( vserver Uses flavor, MANY2ONE)
+
+      -FLAVOR cannot be deleted if related to HPA-CAPABILITY,VSERVER
+
     required:
     - flavor-id
     - flavor-name
@@ -64214,7 +58137,7 @@ getDefinitions:
         description: Flavor id, expected to be unique across cloud-region.
       flavor-name:
         type: string
-        description: Flavor name
+        description: Cloud region Flavor name
       flavor-vcpus:
         type: integer
         format: int32
@@ -64243,6 +58166,11 @@ getDefinitions:
       flavor-disabled:
         type: boolean
         description: Boolean as to whether this flavor is no longer enabled
+      hpa-capabilities:
+        type: array
+        items:
+          $ref: "#/getDefinitions/hpa-capability"
+        description: List of flavor specific HPA Capabilities
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -64262,12 +58190,14 @@ getDefinitions:
     description: |
       Entity describing a sequenced segment of forwarding path
       ###### Related Nodes
-      - TO forwarding-path( forwarder org.onap.relationships.inventory.BelongsTo forwarding-path, MANY2ONE)
-      - TO l-interface( forwarder org.onap.relationships.inventory.ForwardsTo l-interface, MANY2ONE)
-      - TO configuration( forwarder org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - TO lag-interface( forwarder org.onap.relationships.inventory.ForwardsTo lag-interface, MANY2ONE)
-      - TO p-interface( forwarder org.onap.relationships.inventory.ForwardsTo p-interface, MANY2ONE)
-      - FORWARDER deletion means associated objects of these types are also DELETED:CONFIGURATION
+      - TO forwarding-path( forwarder BelongsTo forwarding-path, MANY2ONE)(4)
+      - TO l-interface( forwarder ForwardsTo l-interface, MANY2ONE)
+      - TO configuration( forwarder Uses configuration, ONE2ONE)(2)
+      - TO lag-interface( forwarder ForwardsTo lag-interface, MANY2ONE)
+      - TO p-interface( forwarder ForwardsTo p-interface, MANY2ONE)
+
+      -(2) IF this FORWARDER node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this FORWARDER is DELETED also
     required:
     - sequence
     properties:
@@ -64289,7 +58219,9 @@ getDefinitions:
     description: |
       forwarder object is an optional child object of the Configuration object.
       ###### Related Nodes
-      - TO configuration( forwarder-evc org.onap.relationships.inventory.BelongsTo configuration, ONE2ONE)
+      - TO configuration( forwarder-evc BelongsTo configuration, ONE2ONE)(4)
+
+      -(4) IF this TO node is deleted, this FORWARDER-EVC is DELETED also
     required:
     - forwarder-evc-id
     properties:
@@ -64331,11 +58263,13 @@ getDefinitions:
     description: |
       Entity that describes the sequenced forwarding path between interfaces of services or resources
       ###### Related Nodes
-      - TO service-instance( forwarding-path org.onap.relationships.inventory.AppliesTo service-instance, MANY2ONE)
-      - TO configuration( forwarding-path org.onap.relationships.inventory.Uses configuration, ONE2ONE)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.BelongsTo forwarding-path, MANY2ONE)
-      - FORWARDING-PATH is DELETED when these are DELETED FORWARDER
-      - FORWARDING-PATH deletion means associated objects of these types are also DELETED:CONFIGURATION
+      - TO service-instance( forwarding-path AppliesTo service-instance, MANY2ONE)(4)
+      - TO configuration( forwarding-path Uses configuration, ONE2ONE)(2)
+      - FROM forwarder( forwarder BelongsTo forwarding-path, MANY2ONE)(1)
+
+      -(1) IF this FORWARDING-PATH node is deleted, this FROM node is DELETED also
+      -(2) IF this FORWARDING-PATH node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this FORWARDING-PATH is DELETED also
     required:
     - forwarding-path-id
     - forwarding-path-name
@@ -64370,44 +58304,41 @@ getDefinitions:
     description: |
       General purpose VNF
       ###### Related Nodes
-      - TO availability-zone( generic-vnf org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - TO complex( generic-vnf org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - TO configuration( generic-vnf org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - TO ctag-pool( generic-vnf org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
-      - TO instance-group( generic-vnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO ipsec-configuration( generic-vnf org.onap.relationships.inventory.Uses ipsec-configuration, MANY2ONE)
-      - TO l3-network( generic-vnf org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - TO license-key-resource( generic-vnf org.onap.relationships.inventory.Uses license-key-resource, MANY2MANY)
-      - TO pnf( generic-vnf tosca.relationships.HostedOn pnf, MANY2MANY)
-      - TO pserver( generic-vnf tosca.relationships.HostedOn pserver, MANY2MANY)
-      - TO vnf-image( generic-vnf org.onap.relationships.inventory.Uses vnf-image, MANY2ONE)
-      - TO volume-group( generic-vnf org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
-      - TO vserver( generic-vnf tosca.relationships.HostedOn vserver, ONE2MANY)
-      - TO virtual-data-center( generic-vnf org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - TO model-ver( generic-vnf org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.PartOf generic-vnf, MANY2MANY)
-      - FROM entitlement( entitlement org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM lag-interface( lag-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM license( license org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM network-profile( network-profile org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf generic-vnf, ONE2MANY)
-      - FROM site-pair-set( site-pair-set org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - FROM line-of-business( line-of-business org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.BridgedTo generic-vnf, MANY2MANY)
-      - FROM platform( platform org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
-      - GENERIC-VNF is DELETED when these are DELETED ENTITLEMENT,VNFC,LAG-INTERFACE,LICENSE,L-INTERFACE,VF-MODULE
-      - GENERIC-VNF deletion means associated objects of these types are also DELETED:CONFIGURATION
+      - TO availability-zone( generic-vnf Uses availability-zone, MANY2MANY)
+      - TO complex( generic-vnf LocatedIn complex, MANY2MANY)
+      - TO configuration( generic-vnf Uses configuration, ONE2MANY)(2)
+      - TO ctag-pool( generic-vnf Uses ctag-pool, MANY2MANY)
+      - TO instance-group( generic-vnf MemberOf instance-group, MANY2MANY)
+      - TO ipsec-configuration( generic-vnf Uses ipsec-configuration, MANY2ONE)
+      - TO l3-network( generic-vnf Uses l3-network, MANY2MANY)
+      - TO license-key-resource( generic-vnf Uses license-key-resource, MANY2MANY)
+      - TO pnf( generic-vnf HostedOn pnf, MANY2MANY)
+      - TO pserver( generic-vnf HostedOn pserver, MANY2MANY)
+      - TO vnf-image( generic-vnf Uses vnf-image, MANY2ONE)
+      - TO volume-group( generic-vnf DependsOn volume-group, ONE2MANY)
+      - TO vserver( generic-vnf HostedOn vserver, ONE2MANY)
+      - TO virtual-data-center( generic-vnf LocatedIn virtual-data-center, MANY2MANY)
+      - TO model-ver( generic-vnf IsA model-ver, Many2One)
+      - FROM allotted-resource( allotted-resource PartOf generic-vnf, MANY2MANY)
+      - FROM entitlement( entitlement BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM vnfc( vnfc BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM lag-interface( lag-interface BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM license( license BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM l-interface( l-interface BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM network-profile( network-profile AppliesTo generic-vnf, MANY2MANY)
+      - FROM service-instance( service-instance ComposedOf generic-vnf, ONE2MANY)
+      - FROM site-pair-set( site-pair-set AppliesTo generic-vnf, MANY2MANY)
+      - FROM vf-module( vf-module BelongsTo generic-vnf, MANY2ONE)(1)
+      - FROM line-of-business( line-of-business Uses generic-vnf, MANY2MANY)
+      - FROM logical-link( logical-link BridgedTo generic-vnf, MANY2MANY)
+      - FROM platform( platform Uses generic-vnf, MANY2MANY)
+
+      -(1) IF this GENERIC-VNF node is deleted, this FROM node is DELETED also
+      -(2) IF this GENERIC-VNF node is deleted, this TO node is DELETED also
     required:
     - vnf-id
-    - vnf-instance-id
     - vnf-name
     - vnf-type
-    - vnf-package-name
-    - vnf-discriptor-name
-    - job-id
     - in-maint
     - is-closed-loop-disabled
     properties:
@@ -64511,8 +58442,10 @@ getDefinitions:
         description: number of network in vnf.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       is-closed-loop-disabled:
         type: boolean
+        description: used to indicate whether closed loop function is enabled on this node
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -64623,9 +58556,10 @@ getDefinitions:
     description: |
       Openstack group-assignment used to store exclusivity groups (EG).
       ###### Related Nodes
-      - TO cloud-region( group-assignment org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM pserver( pserver org.onap.relationships.inventory.MemberOf group-assignment, MANY2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.MemberOf group-assignment, MANY2MANY)
+      - TO cloud-region( group-assignment BelongsTo cloud-region, MANY2ONE)
+      - FROM pserver( pserver MemberOf group-assignment, MANY2ONE)
+      - FROM tenant( tenant MemberOf group-assignment, MANY2MANY)
+
     required:
     - group-id
     - group-type
@@ -64661,7 +58595,9 @@ getDefinitions:
   host-route:
     description: |
       ###### Related Nodes
-      - TO subnet( host-route org.onap.relationships.inventory.BelongsTo subnet, MANY2ONE)
+      - TO subnet( host-route BelongsTo subnet, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this HOST-ROUTE is DELETED also
     required:
     - host-route-id
     - route-prefix
@@ -64692,15 +58628,84 @@ getDefinitions:
         type: array
         items:          
           $ref: "#/getDefinitions/host-route"
+  hpa-capabilities:
+    description: |
+      Collection of HPA Capabilities
+    properties:
+      hpa-capability:
+        type: array
+        items:          
+          $ref: "#/getDefinitions/hpa-capability"
+  hpa-capability:
+    description: |
+      Represents a HPA capability
+      ###### Related Nodes
+      - TO flavor( hpa-capability BelongsTo flavor, MANY2ONE)
+      - TO cloud-region( hpa-capability BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-feature-attributes( hpa-feature-attributes BelongsTo hpa-capability, MANY2ONE)(1)
+
+      -(1) IF this HPA-CAPABILITY node is deleted, this FROM node is DELETED also
+    required:
+    - hpa-capability-id
+    - hpa-feature
+    properties:
+      hpa-capability-id:
+        type: string
+        description: UUID to uniquely identify a HPA capability
+      hpa-feature:
+        type: string
+        description: Name of the HPACapability
+      hpa-version:
+        type: string
+        description: HPA schema version
+      architecture:
+        type: string
+        description: Hardware architecture
+      resource-version:
+        type: string
+        description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
+      relationship-list:
+        type: array
+        items:
+          $ref: "#/getDefinitions/relationship"
+      hpa-feature-attributes:
+        type: array
+        items:          
+          $ref: "#/getDefinitions/hpa-feature-attributes"
+  hpa-feature-attributes:
+    description: |
+      HPA Capability Feature attributes
+      ###### Related Nodes
+      - TO hpa-capability( hpa-feature-attributes BelongsTo hpa-capability, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this HPA-FEATURE-ATTRIBUTES is DELETED also
+    required:
+    - hpa-attribute-key
+    properties:
+      hpa-attribute-key:
+        type: string
+        description: name of the specific HPA attribute
+      hpa-attribute-value:
+        type: string
+        description: JSON string specifying the value, unit and type of the specific HPA attribute
+      resource-version:
+        type: string
+        description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
+      relationship-list:
+        type: array
+        items:
+          $ref: "#/getDefinitions/relationship"
   image:
     description: |
       Openstack image.
       ###### Related Nodes
-      - TO cloud-region( image org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo image, MANY2ONE)
-      - FROM vserver( vserver org.onap.relationships.inventory.Uses image, MANY2ONE)
-      - IMAGE cannot be deleted if linked to VSERVER
-      - IMAGE is DELETED when these are DELETED METADATUM
+      - TO cloud-region( image BelongsTo cloud-region, MANY2ONE)
+      - FROM metadatum( metadatum BelongsTo image, MANY2ONE)(1)
+      - FROM vserver( vserver Uses image, MANY2ONE)
+
+      -(1) IF this IMAGE node is deleted, this FROM node is DELETED also
+      -IMAGE cannot be deleted if related to VSERVER
+
     required:
     - image-id
     - image-name
@@ -64773,22 +58778,20 @@ getDefinitions:
     description: |
       General mechanism for grouping instances
       ###### Related Nodes
-      - TO model( instance-group org.onap.relationships.inventory.Targets model, MANY2MANY)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM pnf( pnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM vip-ipv4-address-list( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM vip-ipv6-address-list( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
+      - TO model( instance-group Targets model, MANY2MANY)
+      - FROM allotted-resource( allotted-resource MemberOf instance-group, MANY2MANY)
+      - FROM generic-vnf( generic-vnf MemberOf instance-group, MANY2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - FROM l3-network( l3-network MemberOf instance-group, MANY2MANY)
+      - FROM l-interface( l-interface MemberOf instance-group, MANY2MANY)
+      - FROM pnf( pnf MemberOf instance-group, MANY2MANY)
+      - FROM service-instance( service-instance MemberOf instance-group, MANY2MANY)
+      - FROM vip-ipv4-address-list( vip-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - FROM vip-ipv6-address-list( vip-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - FROM vnfc( vnfc MemberOf instance-group, MANY2MANY)
+
     required:
-    - instance-group-role
-    - model-invariant-id
-    - model-version-id
     - id
     - description
     - type
@@ -64852,13 +58855,9 @@ getDefinitions:
       network:
         type: object
         $ref: "#/getDefinitions/network"
-      aai-internal:
-        type: object
-        $ref: "#/getDefinitions/aai-internal"
       nodes:
-        type: array
-        items:
-          $ref: "#/getDefinitions/aai-internal"
+        type: object
+        $ref: "#/getDefinitions/nodes"
   inventory-item:
     properties:
       inventory-item-type:
@@ -64903,9 +58902,10 @@ getDefinitions:
     description: |
       IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C
       ###### Related Nodes
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses ipsec-configuration, MANY2ONE)
-      - FROM vig-server( vig-server org.onap.relationships.inventory.BelongsTo ipsec-configuration, MANY2ONE)
-      - IPSEC-CONFIGURATION is DELETED when these are DELETED VIG-SERVER
+      - FROM generic-vnf( generic-vnf Uses ipsec-configuration, MANY2ONE)
+      - FROM vig-server( vig-server BelongsTo ipsec-configuration, MANY2ONE)(1)
+
+      -(1) IF this IPSEC-CONFIGURATION node is deleted, this FROM node is DELETED also
     required:
     - ipsec-configuration-id
     properties:
@@ -64999,26 +58999,28 @@ getDefinitions:
     description: |
       Logical interfaces, e.g., a vnic.
       ###### Related Nodes
-      - TO generic-vnf( l-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO lag-interface( l-interface org.onap.relationships.inventory.BelongsTo lag-interface, MANY2ONE)
-      - TO instance-group( l-interface org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO l-interface( l-interface org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - TO logical-link( l-interface tosca.relationships.network.LinksTo logical-link, MANY2MANY)
-      - TO newvce( l-interface org.onap.relationships.inventory.BelongsTo newvce, MANY2ONE)
-      - TO p-interface( l-interface tosca.relationships.network.BindsTo p-interface, MANY2ONE)
-      - TO vserver( l-interface tosca.relationships.network.BindsTo vserver, MANY2ONE)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.Uses l-interface, ONE2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Source l-interface, ONE2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Destination l-interface, ONE2MANY)
-      - FROM sriov-vf( sriov-vf org.onap.relationships.inventory.BelongsTo l-interface, ONE2ONE)
-      - FROM vlan( vlan tosca.relationships.network.LinksTo l-interface, MANY2ONE)
-      - FROM configuration( configuration org.onap.relationships.inventory.AppliesTo l-interface, ONE2MANY)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.ForwardsTo l-interface, MANY2ONE)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - L-INTERFACE is DELETED when these are DELETED L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST,LOGICAL-LINK,SRIOV-VF,VLAN
-      - L-INTERFACE deletion means associated objects of these types are also DELETED:LOGICAL-LINK
+      - TO generic-vnf( l-interface BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO lag-interface( l-interface BelongsTo lag-interface, MANY2ONE)(4)
+      - TO instance-group( l-interface MemberOf instance-group, MANY2MANY)
+      - TO l-interface( l-interface BelongsTo l-interface, MANY2ONE)(4)
+      - TO logical-link( l-interface LinksTo logical-link, MANY2MANY)(2)
+      - TO newvce( l-interface BelongsTo newvce, MANY2ONE)(4)
+      - TO p-interface( l-interface BindsTo p-interface, MANY2ONE)(4)
+      - TO vserver( l-interface BindsTo vserver, MANY2ONE)(4)
+      - FROM allotted-resource( allotted-resource Uses l-interface, ONE2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list BelongsTo l-interface, MANY2ONE)(1)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list BelongsTo l-interface, MANY2ONE)(1)
+      - FROM logical-link( logical-link Source l-interface, ONE2MANY)(1)
+      - FROM logical-link( logical-link Destination l-interface, ONE2MANY)(1)
+      - FROM sriov-vf( sriov-vf BelongsTo l-interface, ONE2ONE)(1)
+      - FROM vlan( vlan LinksTo l-interface, MANY2ONE)(1)
+      - FROM configuration( configuration AppliesTo l-interface, ONE2MANY)
+      - FROM forwarder( forwarder ForwardsTo l-interface, MANY2ONE)
+      - FROM l-interface( l-interface BelongsTo l-interface, MANY2ONE)(4)
+
+      -(1) IF this L-INTERFACE node is deleted, this FROM node is DELETED also
+      -(2) IF this L-INTERFACE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this L-INTERFACE is DELETED also
     required:
     - interface-name
     - is-port-mirrored
@@ -65054,16 +59056,19 @@ getDefinitions:
         description: Human friendly text regarding this interface.
       is-port-mirrored:
         type: boolean
+        description: boolean indicatating whether or not port is a mirrored.
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       prov-status:
         type: string
         description: Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV].
       is-ip-unnumbered:
         type: boolean
+        description: Flag indicating the interface uses the IP Unnumbered configuration.
       allowed-address-pairs:
         type: string
         description: Freeform field for storing an ip address, list of ip addresses or a subnet block.
@@ -65103,12 +59108,14 @@ getDefinitions:
     description: |
       IPv4 Address Range
       ###### Related Nodes
-      - TO instance-group( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - TO l3-network( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - TO subnet( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - TO l-interface( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - TO vlan( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - TO vnfc( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
+      - TO instance-group( l3-interface-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - TO l3-network( l3-interface-ipv4-address-list MemberOf l3-network, MANY2MANY)
+      - TO subnet( l3-interface-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - TO l-interface( l3-interface-ipv4-address-list BelongsTo l-interface, MANY2ONE)(4)
+      - TO vlan( l3-interface-ipv4-address-list BelongsTo vlan, MANY2ONE)(4)
+      - TO vnfc( l3-interface-ipv4-address-list BelongsTo vnfc, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this L3-INTERFACE-IPV4-ADDRESS-LIST is DELETED also
     required:
     - l3-interface-ipv4-address
     properties:
@@ -65147,12 +59154,14 @@ getDefinitions:
     description: |
       IPv6 Address Range
       ###### Related Nodes
-      - TO instance-group( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf instance-group, MANY2MANY)
-      - TO l3-network( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - TO subnet( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - TO l-interface( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo l-interface, MANY2ONE)
-      - TO vlan( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - TO vnfc( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
+      - TO instance-group( l3-interface-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - TO l3-network( l3-interface-ipv6-address-list MemberOf l3-network, MANY2MANY)
+      - TO subnet( l3-interface-ipv6-address-list MemberOf subnet, MANY2MANY)
+      - TO l-interface( l3-interface-ipv6-address-list BelongsTo l-interface, MANY2ONE)(4)
+      - TO vlan( l3-interface-ipv6-address-list BelongsTo vlan, MANY2ONE)(4)
+      - TO vnfc( l3-interface-ipv6-address-list BelongsTo vnfc, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this L3-INTERFACE-IPV6-ADDRESS-LIST is DELETED also
     required:
     - l3-interface-ipv6-address
     properties:
@@ -65191,24 +59200,25 @@ getDefinitions:
     description: |
       Generic network definition
       ###### Related Nodes
-      - TO instance-group( l3-network org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO network-policy( l3-network org.onap.relationships.inventory.Uses network-policy, MANY2MANY)
-      - TO route-table-reference( l3-network org.onap.relationships.inventory.Uses route-table-reference, MANY2MANY)
-      - TO vpn-binding( l3-network org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - TO model-ver( l3-network org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.PartOf l3-network, MANY2MANY)
-      - FROM cloud-region( cloud-region org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM complex( complex org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf l3-network, MANY2MANY)
-      - FROM ctag-assignment( ctag-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM segmentation-assignment( segmentation-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf l3-network, ONE2MANY)
-      - FROM subnet( subnet org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.DependsOn l3-network, MANY2MANY)
-      - L3-NETWORK is DELETED when these are DELETED CTAG-ASSIGNMENT,SEGMENTATION-ASSIGNMENT,SUBNET
+      - TO instance-group( l3-network MemberOf instance-group, MANY2MANY)
+      - TO network-policy( l3-network Uses network-policy, MANY2MANY)
+      - TO route-table-reference( l3-network Uses route-table-reference, MANY2MANY)
+      - TO vpn-binding( l3-network Uses vpn-binding, MANY2MANY)
+      - TO model-ver( l3-network IsA model-ver, Many2One)
+      - FROM allotted-resource( allotted-resource PartOf l3-network, MANY2MANY)
+      - FROM cloud-region( cloud-region Uses l3-network, MANY2MANY)
+      - FROM complex( complex Uses l3-network, MANY2MANY)
+      - FROM generic-vnf( generic-vnf Uses l3-network, MANY2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list MemberOf l3-network, MANY2MANY)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list MemberOf l3-network, MANY2MANY)
+      - FROM ctag-assignment( ctag-assignment BelongsTo l3-network, MANY2ONE)(1)
+      - FROM segmentation-assignment( segmentation-assignment BelongsTo l3-network, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf l3-network, ONE2MANY)
+      - FROM subnet( subnet BelongsTo l3-network, MANY2ONE)(1)
+      - FROM tenant( tenant Uses l3-network, MANY2MANY)
+      - FROM vf-module( vf-module DependsOn l3-network, MANY2MANY)
+
+      -(1) IF this L3-NETWORK node is deleted, this FROM node is DELETED also
     required:
     - network-id
     - network-name
@@ -65237,6 +59247,7 @@ getDefinitions:
         description: Neutron network id of this Interface
       is-bound-to-vpn:
         type: boolean
+        description: Set to true if bound to VPN
       service-id:
         type: string
         description: Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED
@@ -65282,10 +59293,13 @@ getDefinitions:
         description: Name associated with the physical network.
       is-provider-network:
         type: boolean
+        description: boolean indicatating whether or not network is a provider network.
       is-shared-network:
         type: boolean
+        description: boolean indicatating whether or not network is a shared network.
       is-external-network:
         type: boolean
+        description: boolean indicatating whether or not network is an external network.
       selflink:
         type: string
         description: Path to the controller object.
@@ -65319,17 +59333,19 @@ getDefinitions:
     description: |
       Link aggregate interface
       ###### Related Nodes
-      - TO generic-vnf( lag-interface org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO lag-link( lag-interface tosca.relationships.network.LinksTo lag-link, MANY2MANY)
-      - TO logical-link( lag-interface org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - TO p-interface( lag-interface org.onap.relationships.inventory.Uses p-interface, MANY2MANY)
-      - TO pnf( lag-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - TO pserver( lag-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - TO vpls-pe( lag-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo lag-interface, MANY2ONE)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.ForwardsTo lag-interface, MANY2ONE)
-      - LAG-INTERFACE is DELETED when these are DELETED L-INTERFACE
-      - LAG-INTERFACE deletion means associated objects of these types are also DELETED:LAG-LINK,LOGICAL-LINK
+      - TO generic-vnf( lag-interface BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO lag-link( lag-interface LinksTo lag-link, MANY2MANY)(2)
+      - TO logical-link( lag-interface Uses logical-link, MANY2MANY)(2)
+      - TO p-interface( lag-interface Uses p-interface, MANY2MANY)
+      - TO pnf( lag-interface BindsTo pnf, MANY2ONE)(4)
+      - TO pserver( lag-interface BindsTo pserver, MANY2ONE)(4)
+      - TO vpls-pe( lag-interface BindsTo vpls-pe, MANY2ONE)(4)
+      - FROM l-interface( l-interface BelongsTo lag-interface, MANY2ONE)(1)
+      - FROM forwarder( forwarder ForwardsTo lag-interface, MANY2ONE)
+
+      -(1) IF this LAG-INTERFACE node is deleted, this FROM node is DELETED also
+      -(2) IF this LAG-INTERFACE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this LAG-INTERFACE is DELETED also
     required:
     - interface-name
     - in-maint
@@ -65360,6 +59376,7 @@ getDefinitions:
         description: Trigger for operational monitoring of this resource by Service Assurance systems.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       relationship-list:
         type: array
         items:
@@ -65380,8 +59397,10 @@ getDefinitions:
     description: |
       LAG links can connect lag-interfaces
       ###### Related Nodes
-      - FROM lag-interface( lag-interface tosca.relationships.network.LinksTo lag-link, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Uses lag-link, MANY2MANY)
+      - FROM lag-interface( lag-interface LinksTo lag-link, MANY2MANY)(3)
+      - FROM logical-link( logical-link Uses lag-link, MANY2MANY)
+
+      -(3) IF this FROM node is deleted, this LAG-LINK is DELETED also
     required:
     - link-name
     properties:
@@ -65407,8 +59426,10 @@ getDefinitions:
     description: |
       Metadata for license group.
       ###### Related Nodes
-      - TO generic-vnf( license org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO vce( license org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
+      - TO generic-vnf( license BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO vce( license BelongsTo vce, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this LICENSE is DELETED also
     required:
     - group-uuid
     - resource-uuid
@@ -65438,7 +59459,8 @@ getDefinitions:
     description: |
       describes a line-of-business
       ###### Related Nodes
-      - TO generic-vnf( line-of-business org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
+      - TO generic-vnf( line-of-business Uses generic-vnf, MANY2MANY)
+
     required:
     - line-of-business-name
     properties:
@@ -65464,24 +59486,27 @@ getDefinitions:
     description: |
       Logical links generally connect l-interfaces but are used to express logical connectivity between two points
       ###### Related Nodes
-      - TO l-interface( logical-link org.onap.relationships.inventory.Source l-interface, ONE2MANY)
-      - TO l-interface( logical-link org.onap.relationships.inventory.Destination l-interface, ONE2MANY)
-      - TO cloud-region( logical-link org.onap.relationships.inventory.LocatedIn cloud-region, MANY2MANY)
-      - TO generic-vnf( logical-link org.onap.relationships.inventory.BridgedTo generic-vnf, MANY2MANY)
-      - TO lag-link( logical-link org.onap.relationships.inventory.Uses lag-link, MANY2MANY)
-      - TO logical-link( logical-link org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - TO pnf( logical-link org.onap.relationships.inventory.BridgedTo pnf, MANY2MANY)
-      - TO pserver( logical-link org.onap.relationships.inventory.BridgedTo pserver, MANY2MANY)
-      - TO vpn-binding( logical-link org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - TO virtual-data-center( logical-link org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - TO model-ver( logical-link org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM configuration( configuration org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - FROM lag-interface( lag-interface org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - FROM l-interface( l-interface tosca.relationships.network.LinksTo logical-link, MANY2MANY)
-      - FROM p-interface( p-interface tosca.relationships.network.LinksTo logical-link, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - FROM vlan( vlan org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
+      - TO l-interface( logical-link Source l-interface, ONE2MANY)(4)
+      - TO l-interface( logical-link Destination l-interface, ONE2MANY)(4)
+      - TO cloud-region( logical-link LocatedIn cloud-region, MANY2MANY)
+      - TO generic-vnf( logical-link BridgedTo generic-vnf, MANY2MANY)
+      - TO lag-link( logical-link Uses lag-link, MANY2MANY)
+      - TO logical-link( logical-link Uses logical-link, MANY2MANY)
+      - TO pnf( logical-link BridgedTo pnf, MANY2MANY)
+      - TO pserver( logical-link BridgedTo pserver, MANY2MANY)
+      - TO vpn-binding( logical-link Uses vpn-binding, MANY2MANY)
+      - TO virtual-data-center( logical-link LocatedIn virtual-data-center, MANY2MANY)
+      - TO model-ver( logical-link IsA model-ver, Many2One)
+      - FROM configuration( configuration Uses logical-link, ONE2MANY)(3)
+      - FROM lag-interface( lag-interface Uses logical-link, MANY2MANY)(3)
+      - FROM l-interface( l-interface LinksTo logical-link, MANY2MANY)(3)
+      - FROM p-interface( p-interface LinksTo logical-link, MANY2ONE)
+      - FROM service-instance( service-instance Uses logical-link, ONE2MANY)(3)
+      - FROM vlan( vlan Uses logical-link, MANY2MANY)(3)
+      - FROM logical-link( logical-link Uses logical-link, MANY2MANY)
+
+      -(3) IF this FROM node is deleted, this LOGICAL-LINK is DELETED also
+      -(4) IF this TO node is deleted, this LOGICAL-LINK is DELETED also
     required:
     - link-name
     - in-maint
@@ -65492,6 +59517,7 @@ getDefinitions:
         description: e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       link-type:
         type: string
         description: Type of logical link, e.g., evc
@@ -65570,11 +59596,13 @@ getDefinitions:
     description: |
       Key/value pairs
       ###### Related Nodes
-      - TO configuration( metadatum org.onap.relationships.inventory.BelongsTo configuration, MANY2ONE)
-      - TO connector( metadatum org.onap.relationships.inventory.BelongsTo connector, MANY2ONE)
-      - TO image( metadatum org.onap.relationships.inventory.BelongsTo image, MANY2ONE)
-      - TO model-ver( metadatum org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - TO service-instance( metadatum org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
+      - TO configuration( metadatum BelongsTo configuration, MANY2ONE)(4)
+      - TO connector( metadatum BelongsTo connector, MANY2ONE)(4)
+      - TO image( metadatum BelongsTo image, MANY2ONE)(4)
+      - TO model-ver( metadatum BelongsTo model-ver, MANY2ONE)(4)
+      - TO service-instance( metadatum BelongsTo service-instance, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this METADATUM is DELETED also
     required:
     - metaname
     - metaval
@@ -65590,13 +59618,15 @@ getDefinitions:
     description: |
       Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version
       ###### Related Nodes
-      - TO model( model-ver org.onap.relationships.inventory.BelongsTo model, MANY2ONE)
-      - FROM instance-group( instance-group org.onap.relationships.inventory.Targets model, MANY2MANY)
-      - FROM model-ver( model-ver org.onap.relationships.inventory.BelongsTo model, MANY2ONE)
-      - FROM named-query( named-query org.onap.relationships.inventory.AppliesTo model, ONE2MANY)
-      - FROM named-query-element( named-query-element org.onap.relationships.inventory.IsA model, MANY2ONE)
-      - MODEL cannot be deleted if linked to INSTANCE-GROUP,NAMED-QUERY,NAMED-QUERY-ELEMENT
-      - MODEL is DELETED when these are DELETED MODEL-VER
+      - TO model( model-ver BelongsTo model, MANY2ONE)(1)
+      - FROM instance-group( instance-group Targets model, MANY2MANY)
+      - FROM model-ver( model-ver BelongsTo model, MANY2ONE)(1)
+      - FROM named-query( named-query AppliesTo model, ONE2MANY)
+      - FROM named-query-element( named-query-element IsA model, MANY2ONE)
+
+      -(1) IF this MODEL node is deleted, this FROM node is DELETED also
+      -MODEL cannot be deleted if related to INSTANCE-GROUP,NAMED-QUERY,NAMED-QUERY-ELEMENT
+
     required:
     - model-invariant-id
     - model-type
@@ -65639,9 +59669,11 @@ getDefinitions:
     description: |
       This is how we would capture constraints defining allowed sets of elements.
       ###### Related Nodes
-      - TO model-element( model-constraint org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM constrained-element-set( constrained-element-set org.onap.relationships.inventory.BelongsTo model-constraint, MANY2ONE)
-      - MODEL-CONSTRAINT is DELETED when these are DELETED CONSTRAINED-ELEMENT-SET
+      - TO model-element( model-constraint BelongsTo model-element, MANY2ONE)(4)
+      - FROM constrained-element-set( constrained-element-set BelongsTo model-constraint, MANY2ONE)(1)
+
+      -(1) IF this MODEL-CONSTRAINT node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this MODEL-CONSTRAINT is DELETED also
     required:
     - model-constraint-uuid
     - constrained-element-set-uuid-to-replace
@@ -65667,14 +59699,16 @@ getDefinitions:
     description: |
       Defines how other models combine to make up a higher-level model.
       ###### Related Nodes
-      - TO element-choice-set( model-element org.onap.relationships.inventory.BelongsTo element-choice-set, MANY2ONE)
-      - TO model-element( model-element org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - TO model-ver( model-element org.onap.relationships.inventory.IsA model-ver, MANY2ONE)
-      - TO model-ver( model-element org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - FROM constrained-element-set( constrained-element-set org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM model-constraint( model-constraint org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.BelongsTo model-element, MANY2ONE)
-      - MODEL-ELEMENT is DELETED when these are DELETED CONSTRAINED-ELEMENT-SET,MODEL-CONSTRAINT
+      - TO element-choice-set( model-element BelongsTo element-choice-set, MANY2ONE)(4)
+      - TO model-element( model-element BelongsTo model-element, MANY2ONE)(4)
+      - TO model-ver( model-element IsA model-ver, MANY2ONE)
+      - TO model-ver( model-element BelongsTo model-ver, MANY2ONE)(4)
+      - FROM constrained-element-set( constrained-element-set BelongsTo model-element, MANY2ONE)(1)
+      - FROM model-constraint( model-constraint BelongsTo model-element, MANY2ONE)(1)
+      - FROM model-element( model-element BelongsTo model-element, MANY2ONE)(4)
+
+      -(1) IF this MODEL-ELEMENT node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this MODEL-ELEMENT is DELETED also
     required:
     - model-element-uuid
     - new-data-del-flag
@@ -65717,18 +59751,21 @@ getDefinitions:
     description: |
       Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models
       ###### Related Nodes
-      - TO model( model-ver org.onap.relationships.inventory.BelongsTo model, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.IsA model-ver, MANY2ONE)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - FROM model-element( model-element org.onap.relationships.inventory.BelongsTo model-ver, MANY2ONE)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - MODEL-VER cannot be deleted if linked to MODEL-ELEMENT
-      - MODEL-VER is DELETED when these are DELETED METADATUM,MODEL-ELEMENT
+      - TO model( model-ver BelongsTo model, MANY2ONE)(4)
+      - FROM model-element( model-element IsA model-ver, MANY2ONE)
+      - FROM metadatum( metadatum BelongsTo model-ver, MANY2ONE)(1)
+      - FROM model-element( model-element BelongsTo model-ver, MANY2ONE)(1)
+      - FROM allotted-resource( allotted-resource IsA model-ver, Many2One)
+      - FROM generic-vnf( generic-vnf IsA model-ver, Many2One)
+      - FROM l3-network( l3-network IsA model-ver, Many2One)
+      - FROM logical-link( logical-link IsA model-ver, Many2One)
+      - FROM service-instance( service-instance IsA model-ver, Many2One)
+      - FROM vf-module( vf-module IsA model-ver, Many2One)
+
+      -(1) IF this MODEL-VER node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this MODEL-VER is DELETED also
+      -MODEL-VER cannot be deleted if related to MODEL-ELEMENT
+
     required:
     - model-version-id
     - model-name
@@ -65781,7 +59818,8 @@ getDefinitions:
   multicast-configuration:
     description: |
       ###### Related Nodes
-      - FROM vlan( vlan org.onap.relationships.inventory.Uses multicast-configuration, MANY2MANY)
+      - FROM vlan( vlan Uses multicast-configuration, MANY2MANY)
+
     required:
     - multicast-configuration-id
     - multicast-protocol
@@ -65821,10 +59859,11 @@ getDefinitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query( named-query-element org.onap.relationships.inventory.BelongsTo named-query, ONE2ONE)
-      - TO model( named-query org.onap.relationships.inventory.AppliesTo model, ONE2MANY)
-      - FROM named-query-element( named-query-element org.onap.relationships.inventory.BelongsTo named-query, ONE2ONE)
-      - NAMED-QUERY is DELETED when these are DELETED NAMED-QUERY-ELEMENT
+      - TO named-query( named-query-element BelongsTo named-query, ONE2ONE)(1)
+      - TO model( named-query AppliesTo model, ONE2MANY)
+      - FROM named-query-element( named-query-element BelongsTo named-query, ONE2ONE)(1)
+
+      -(1) IF this NAMED-QUERY node is deleted, this FROM node is DELETED also
     required:
     - named-query-uuid
     - named-query-name
@@ -65854,13 +59893,15 @@ getDefinitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query( named-query-element org.onap.relationships.inventory.BelongsTo named-query, ONE2ONE)
-      - TO model( named-query-element org.onap.relationships.inventory.IsA model, MANY2ONE)
-      - TO named-query-element( named-query-element org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - FROM property-constraint( property-constraint org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - FROM related-lookup( related-lookup org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - FROM named-query-element( named-query-element org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
-      - NAMED-QUERY-ELEMENT is DELETED when these are DELETED PROPERTY-CONSTRAINT,RELATED-LOOKUP
+      - TO named-query( named-query-element BelongsTo named-query, ONE2ONE)(4)
+      - TO model( named-query-element IsA model, MANY2ONE)
+      - TO named-query-element( named-query-element BelongsTo named-query-element, MANY2ONE)(4)
+      - FROM property-constraint( property-constraint BelongsTo named-query-element, MANY2ONE)(1)
+      - FROM related-lookup( related-lookup BelongsTo named-query-element, MANY2ONE)(1)
+      - FROM named-query-element( named-query-element BelongsTo named-query-element, MANY2ONE)(4)
+
+      -(1) IF this NAMED-QUERY-ELEMENT node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this NAMED-QUERY-ELEMENT is DELETED also
     required:
     - named-query-element-uuid
     properties:
@@ -65989,8 +60030,9 @@ getDefinitions:
   network-policy:
     description: |
       ###### Related Nodes
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.Uses network-policy, ONE2ONE)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.Uses network-policy, MANY2MANY)
+      - FROM allotted-resource( allotted-resource Uses network-policy, ONE2ONE)
+      - FROM l3-network( l3-network Uses network-policy, MANY2MANY)
+
     required:
     - network-policy-id
     properties:
@@ -66014,7 +60056,8 @@ getDefinitions:
     description: |
       Network profile populated by SDN-GP for SNMP
       ###### Related Nodes
-      - TO generic-vnf( network-profile org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
+      - TO generic-vnf( network-profile AppliesTo generic-vnf, MANY2MANY)
+
     required:
     - nm-profile-name
     properties:
@@ -66043,8 +60086,9 @@ getDefinitions:
     description: |
       This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.
       ###### Related Nodes
-      - FROM l-interface( l-interface org.onap.relationships.inventory.BelongsTo newvce, MANY2ONE)
-      - NEWVCE is DELETED when these are DELETED L-INTERFACE
+      - FROM l-interface( l-interface BelongsTo newvce, MANY2ONE)(1)
+
+      -(1) IF this NEWVCE node is deleted, this FROM node is DELETED also
     required:
     - vnf-id2
     - vnf-name
@@ -66108,6 +60152,12 @@ getDefinitions:
         type: array
         items:          
           $ref: "#/getDefinitions/newvce"
+  nodes:
+    properties:
+      inventory-item-data:
+        type: array
+        items:
+          $ref: "#/getDefinitions/inventory-item-data"
   notification-event:
     properties:
       cambria.partition:
@@ -66163,9 +60213,10 @@ getDefinitions:
     description: |
       OAM network, to be deprecated shortly.  Do not use for new purposes. 
       ###### Related Nodes
-      - TO cloud-region( oam-network org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO complex( oam-network org.onap.relationships.inventory.AppliesTo complex, MANY2MANY)
-      - TO service-capability( oam-network org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
+      - TO cloud-region( oam-network BelongsTo cloud-region, MANY2ONE)
+      - TO complex( oam-network AppliesTo complex, MANY2MANY)
+      - TO service-capability( oam-network AppliesTo service-capability, MANY2MANY)
+
     required:
     - network-uuid
     - network-name
@@ -66207,8 +60258,9 @@ getDefinitions:
     description: |
       It is a logical partition of the cloud which allows to have multiple environments in the production AIC.
       ###### Related Nodes
-      - TO operational-environment( operational-environment org.onap.relationships.inventory.Uses operational-environment, ONE2ONE)
-      - FROM operational-environment( operational-environment org.onap.relationships.inventory.Uses operational-environment, ONE2ONE)
+      - TO operational-environment( operational-environment Uses operational-environment, ONE2ONE)
+      - FROM operational-environment( operational-environment Uses operational-environment, ONE2ONE)
+
     required:
     - operational-environment-id
     - operational-environment-name
@@ -66303,7 +60355,8 @@ getDefinitions:
     description: |
       describes an owning-entity
       ###### Related Nodes
-      - FROM service-instance( service-instance org.onap.relationships.inventory.BelongsTo owning-entity, MANY2ONE)
+      - FROM service-instance( service-instance BelongsTo owning-entity, MANY2ONE)
+
     required:
     - owning-entity-id
     - owning-entity-name
@@ -66325,17 +60378,19 @@ getDefinitions:
     description: |
       Physical interface (e.g., nic)
       ###### Related Nodes
-      - TO logical-link( p-interface tosca.relationships.network.LinksTo logical-link, MANY2ONE)
-      - TO physical-link( p-interface tosca.relationships.network.LinksTo physical-link, MANY2ONE)
-      - TO pnf( p-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - TO pserver( p-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - TO vpls-pe( p-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - FROM lag-interface( lag-interface org.onap.relationships.inventory.Uses p-interface, MANY2MANY)
-      - FROM l-interface( l-interface tosca.relationships.network.BindsTo p-interface, MANY2ONE)
-      - FROM sriov-pf( sriov-pf org.onap.relationships.inventory.BelongsTo p-interface, ONE2ONE)
-      - FROM forwarder( forwarder org.onap.relationships.inventory.ForwardsTo p-interface, MANY2ONE)
-      - P-INTERFACE is DELETED when these are DELETED L-INTERFACE,SRIOV-PF
-      - P-INTERFACE deletion means associated objects of these types are also DELETED:PHYSICAL-LINK
+      - TO logical-link( p-interface LinksTo logical-link, MANY2ONE)
+      - TO physical-link( p-interface LinksTo physical-link, MANY2ONE)(2)
+      - TO pnf( p-interface BindsTo pnf, MANY2ONE)(4)
+      - TO pserver( p-interface BindsTo pserver, MANY2ONE)(4)
+      - TO vpls-pe( p-interface BindsTo vpls-pe, MANY2ONE)(4)
+      - FROM lag-interface( lag-interface Uses p-interface, MANY2MANY)
+      - FROM l-interface( l-interface BindsTo p-interface, MANY2ONE)(1)
+      - FROM sriov-pf( sriov-pf BelongsTo p-interface, ONE2ONE)(1)
+      - FROM forwarder( forwarder ForwardsTo p-interface, MANY2ONE)
+
+      -(1) IF this P-INTERFACE node is deleted, this FROM node is DELETED also
+      -(2) IF this P-INTERFACE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this P-INTERFACE is DELETED also
     required:
     - interface-name
     - in-maint
@@ -66375,6 +60430,7 @@ getDefinitions:
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       inv-status:
         type: string
         description: inventory status
@@ -66402,7 +60458,9 @@ getDefinitions:
     description: |
       Collection of physical connections, typically between p-interfaces
       ###### Related Nodes
-      - FROM p-interface( p-interface tosca.relationships.network.LinksTo physical-link, MANY2ONE)
+      - FROM p-interface( p-interface LinksTo physical-link, MANY2ONE)(3)
+
+      -(3) IF this FROM node is deleted, this PHYSICAL-LINK is DELETED also
     required:
     - link-name
     properties:
@@ -66460,7 +60518,8 @@ getDefinitions:
     description: |
       describes a platform
       ###### Related Nodes
-      - TO generic-vnf( platform org.onap.relationships.inventory.Uses generic-vnf, MANY2MANY)
+      - TO generic-vnf( platform Uses generic-vnf, MANY2MANY)
+
     required:
     - platform-name
     properties:
@@ -66486,17 +60545,18 @@ getDefinitions:
     description: |
       PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.
       ###### Related Nodes
-      - TO complex( pnf org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO instance-group( pnf org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO zone( pnf org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM esr-thirdparty-sdnc( esr-thirdparty-sdnc has pnf, One2Many)
-      - FROM generic-vnf( generic-vnf tosca.relationships.HostedOn pnf, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.BridgedTo pnf, MANY2MANY)
-      - FROM lag-interface( lag-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - FROM p-interface( p-interface tosca.relationships.network.BindsTo pnf, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf pnf, ONE2MANY)
-      - FROM configuration( configuration org.onap.relationships.inventory.AppliesTo pnf, ONE2MANY)
-      - PNF is DELETED when these are DELETED LAG-INTERFACE,P-INTERFACE
+      - TO complex( pnf LocatedIn complex, MANY2ONE)
+      - TO instance-group( pnf MemberOf instance-group, MANY2MANY)
+      - TO zone( pnf LocatedIn zone, MANY2ONE)
+      - FROM esr-thirdparty-sdnc( esr-thirdparty-sdnc AppliesTo pnf, ONE2MANY)
+      - FROM generic-vnf( generic-vnf HostedOn pnf, MANY2MANY)
+      - FROM logical-link( logical-link BridgedTo pnf, MANY2MANY)
+      - FROM lag-interface( lag-interface BindsTo pnf, MANY2ONE)(1)
+      - FROM p-interface( p-interface BindsTo pnf, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf pnf, ONE2MANY)
+      - FROM configuration( configuration AppliesTo pnf, ONE2MANY)
+
+      -(1) IF this PNF node is deleted, this FROM node is DELETED also
     required:
     - pnf-name
     - in-maint
@@ -66536,6 +60596,7 @@ getDefinitions:
         description: sw-version is the version of SW for the hosted application on the PNF.
       in-maint:
         type: boolean
+        description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       frame-id:
         type: string
         description: ID of the physical frame (relay rack) where pnf is installed.
@@ -66593,9 +60654,11 @@ getDefinitions:
     description: |
       Used to capture the network interfaces of this VCE
       ###### Related Nodes
-      - TO vce( port-group org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM cvlan-tag( cvlan-tag org.onap.relationships.inventory.BelongsTo port-group, MANY2ONE)
-      - PORT-GROUP is DELETED when these are DELETED CVLAN-TAG
+      - TO vce( port-group BelongsTo vce, MANY2ONE)(4)
+      - FROM cvlan-tag( cvlan-tag BelongsTo port-group, MANY2ONE)(1)
+
+      -(1) IF this PORT-GROUP node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this PORT-GROUP is DELETED also
     required:
     - interface-id
     - orchestration-status
@@ -66651,7 +60714,8 @@ getDefinitions:
     description: |
       describes the project
       ###### Related Nodes
-      - TO service-instance( project org.onap.relationships.inventory.Uses service-instance, ONE2MANY)
+      - TO service-instance( project Uses service-instance, ONE2MANY)
+
     required:
     - project-name
     properties:
@@ -66685,7 +60749,9 @@ getDefinitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query-element( property-constraint org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
+      - TO named-query-element( property-constraint BelongsTo named-query-element, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this PROPERTY-CONSTRAINT is DELETED also
     required:
     - property-constraint-uuid
     - constraint-type
@@ -66712,19 +60778,20 @@ getDefinitions:
     description: |
       Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.
       ###### Related Nodes
-      - TO group-assignment( pserver org.onap.relationships.inventory.MemberOf group-assignment, MANY2ONE)
-      - TO availability-zone( pserver org.onap.relationships.inventory.MemberOf availability-zone, MANY2ONE)
-      - TO cloud-region( pserver org.onap.relationships.inventory.LocatedIn cloud-region, MANY2ONE)
-      - TO complex( pserver org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO zone( pserver org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM generic-vnf( generic-vnf tosca.relationships.HostedOn pserver, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.BridgedTo pserver, MANY2MANY)
-      - FROM lag-interface( lag-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - FROM p-interface( p-interface tosca.relationships.network.BindsTo pserver, MANY2ONE)
-      - FROM vserver( vserver tosca.relationships.HostedOn pserver, MANY2ONE)
-      - PSERVER cannot be deleted if linked to GENERIC-VNF,LOGICAL-LINK,VSERVER
-      - PSERVER is DELETED when these are DELETED LAG-INTERFACE,P-INTERFACE
-      - PSERVER cannot be deleted if linked to GROUP-ASSIGNMENT
+      - TO group-assignment( pserver MemberOf group-assignment, MANY2ONE)
+      - TO availability-zone( pserver MemberOf availability-zone, MANY2ONE)
+      - TO cloud-region( pserver LocatedIn cloud-region, MANY2ONE)
+      - TO complex( pserver LocatedIn complex, MANY2ONE)
+      - TO zone( pserver LocatedIn zone, MANY2ONE)
+      - FROM generic-vnf( generic-vnf HostedOn pserver, MANY2MANY)
+      - FROM logical-link( logical-link BridgedTo pserver, MANY2MANY)
+      - FROM lag-interface( lag-interface BindsTo pserver, MANY2ONE)(1)
+      - FROM p-interface( p-interface BindsTo pserver, MANY2ONE)(1)
+      - FROM vserver( vserver HostedOn pserver, MANY2ONE)
+
+      -(1) IF this PSERVER node is deleted, this FROM node is DELETED also
+      -PSERVER cannot be deleted if related to GENERIC-VNF,LOGICAL-LINK,VSERVER,GROUP-ASSIGNMENT
+
     required:
     - hostname
     - in-maint
@@ -66794,6 +60861,7 @@ getDefinitions:
         description: internet topology of Pserver
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -66846,7 +60914,9 @@ getDefinitions:
     description: |
       TBD
       ###### Related Nodes
-      - TO named-query-element( related-lookup org.onap.relationships.inventory.BelongsTo named-query-element, MANY2ONE)
+      - TO named-query-element( related-lookup BelongsTo named-query-element, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this RELATED-LOOKUP is DELETED also
     required:
     - related-lookup-uuid
     - source-node-type
@@ -66961,7 +61031,8 @@ getDefinitions:
     description: |
       Openstack route table reference.
       ###### Related Nodes
-      - FROM l3-network( l3-network org.onap.relationships.inventory.Uses route-table-reference, MANY2MANY)
+      - FROM l3-network( l3-network Uses route-table-reference, MANY2MANY)
+
     required:
     - route-table-reference-id
     - route-table-reference-fqdn
@@ -66991,7 +61062,9 @@ getDefinitions:
     description: |
       Route target information
       ###### Related Nodes
-      - TO vpn-binding( route-target org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2ONE)
+      - TO vpn-binding( route-target BelongsTo vpn-binding, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this ROUTE-TARGET is DELETED also
     required:
     - global-route-target
     - route-target-role
@@ -67020,9 +61093,11 @@ getDefinitions:
   routing-instance:
     description: |
       ###### Related Nodes
-      - TO site-pair-set( routing-instance org.onap.relationships.inventory.BelongsTo site-pair-set, MANY2ONE)
-      - FROM site-pair( site-pair org.onap.relationships.inventory.BelongsTo routing-instance, MANY2ONE)
-      - ROUTING-INSTANCE is DELETED when these are DELETED SITE-PAIR
+      - TO site-pair-set( routing-instance BelongsTo site-pair-set, MANY2ONE)(4)
+      - FROM site-pair( site-pair BelongsTo routing-instance, MANY2ONE)(1)
+
+      -(1) IF this ROUTING-INSTANCE node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this ROUTING-INSTANCE is DELETED also
     required:
     - routing-instance-id
     properties:
@@ -67103,7 +61178,9 @@ getDefinitions:
     description: |
       Openstack segmentation assignment.
       ###### Related Nodes
-      - TO l3-network( segmentation-assignment org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
+      - TO l3-network( segmentation-assignment BelongsTo l3-network, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this SEGMENTATION-ASSIGNMENT is DELETED also
     required:
     - segmentation-id
     properties:
@@ -67163,9 +61240,11 @@ getDefinitions:
     description: |
       Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.
       ###### Related Nodes
-      - FROM availability-zone( availability-zone org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
-      - FROM oam-network( oam-network org.onap.relationships.inventory.AppliesTo service-capability, MANY2MANY)
-      - SERVICE-CAPABILITY cannot be deleted if linked to AVAILABILITY-ZONE,OAM-NETWORK
+      - FROM availability-zone( availability-zone AppliesTo service-capability, MANY2MANY)
+      - FROM oam-network( oam-network AppliesTo service-capability, MANY2MANY)
+
+      -SERVICE-CAPABILITY cannot be deleted if related to AVAILABILITY-ZONE,OAM-NETWORK
+
     required:
     - service-type
     - vnf-type
@@ -67211,37 +61290,34 @@ getDefinitions:
     description: |
       Instance of a service
       ###### Related Nodes
-      - TO generic-vnf( service-instance org.onap.relationships.inventory.ComposedOf generic-vnf, ONE2MANY)
-      - TO l3-network( service-instance org.onap.relationships.inventory.ComposedOf l3-network, ONE2MANY)
-      - TO owning-entity( service-instance org.onap.relationships.inventory.BelongsTo owning-entity, MANY2ONE)
-      - TO allotted-resource( service-instance org.onap.relationships.inventory.Uses allotted-resource, MANY2MANY)
-      - TO configuration( service-instance org.onap.relationships.inventory.Uses configuration, ONE2MANY)
-      - TO connector( service-instance org.onap.relationships.inventory.Uses connector, MANY2MANY)
-      - TO ctag-assignment( service-instance org.onap.relationships.inventory.Uses ctag-assignment, ONE2MANY)
-      - TO cvlan-tag( service-instance org.onap.relationships.inventory.ComposedOf cvlan-tag, MANY2MANY)
-      - TO instance-group( service-instance org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO logical-link( service-instance org.onap.relationships.inventory.Uses logical-link, ONE2MANY)
-      - TO pnf( service-instance org.onap.relationships.inventory.ComposedOf pnf, ONE2MANY)
-      - TO service-instance( service-instance org.onap.relationships.inventory.ComposedOf service-instance, ONE2MANY)
-      - TO vlan( service-instance org.onap.relationships.inventory.ComposedOf vlan, ONE2MANY)
-      - TO zone( service-instance org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - TO service-subscription( service-instance org.onap.relationships.inventory.BelongsTo service-subscription, MANY2ONE)
-      - TO vce( service-instance org.onap.relationships.inventory.ComposedOf vce, ONE2MANY)
-      - TO model-ver( service-instance org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - FROM project( project org.onap.relationships.inventory.Uses service-instance, ONE2MANY)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
-      - FROM metadatum( metadatum org.onap.relationships.inventory.BelongsTo service-instance, MANY2ONE)
-      - FROM forwarding-path( forwarding-path org.onap.relationships.inventory.AppliesTo service-instance, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf service-instance, ONE2MANY)
-      - SERVICE-INSTANCE is DELETED when these are DELETED ALLOTTED-RESOURCE,METADATUM,FORWARDING-PATH
-      - SERVICE-INSTANCE deletion means associated objects of these types are also DELETED:LOGICAL-LINK
+      - TO generic-vnf( service-instance ComposedOf generic-vnf, ONE2MANY)
+      - TO l3-network( service-instance ComposedOf l3-network, ONE2MANY)
+      - TO owning-entity( service-instance BelongsTo owning-entity, MANY2ONE)
+      - TO allotted-resource( service-instance Uses allotted-resource, MANY2MANY)
+      - TO configuration( service-instance Uses configuration, ONE2MANY)
+      - TO connector( service-instance Uses connector, MANY2MANY)
+      - TO ctag-assignment( service-instance Uses ctag-assignment, ONE2MANY)
+      - TO cvlan-tag( service-instance ComposedOf cvlan-tag, MANY2MANY)
+      - TO instance-group( service-instance MemberOf instance-group, MANY2MANY)
+      - TO logical-link( service-instance Uses logical-link, ONE2MANY)(2)
+      - TO pnf( service-instance ComposedOf pnf, ONE2MANY)
+      - TO service-instance( service-instance ComposedOf service-instance, ONE2MANY)
+      - TO vlan( service-instance ComposedOf vlan, ONE2MANY)
+      - TO zone( service-instance LocatedIn zone, MANY2ONE)
+      - TO service-subscription( service-instance BelongsTo service-subscription, MANY2ONE)(4)
+      - TO vce( service-instance ComposedOf vce, ONE2MANY)
+      - TO model-ver( service-instance IsA model-ver, Many2One)
+      - FROM project( project Uses service-instance, ONE2MANY)
+      - FROM allotted-resource( allotted-resource BelongsTo service-instance, MANY2ONE)(1)
+      - FROM metadatum( metadatum BelongsTo service-instance, MANY2ONE)(1)
+      - FROM forwarding-path( forwarding-path AppliesTo service-instance, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf service-instance, ONE2MANY)
+
+      -(1) IF this SERVICE-INSTANCE node is deleted, this FROM node is DELETED also
+      -(2) IF this SERVICE-INSTANCE node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this SERVICE-INSTANCE is DELETED also
     required:
     - service-instance-id
-    - service-type
-    - service-role
-    - created-at
-    - updated-at
-    - description
     properties:
       service-instance-id:
         type: string
@@ -67339,10 +61415,12 @@ getDefinitions:
     description: |
       Object that group service instances.
       ###### Related Nodes
-      - TO customer( service-subscription org.onap.relationships.inventory.BelongsTo customer, MANY2ONE)
-      - TO tenant( service-subscription org.onap.relationships.inventory.Uses tenant, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.BelongsTo service-subscription, MANY2ONE)
-      - SERVICE-SUBSCRIPTION is DELETED when these are DELETED SERVICE-INSTANCE
+      - TO customer( service-subscription BelongsTo customer, MANY2ONE)(4)
+      - TO tenant( service-subscription Uses tenant, MANY2MANY)
+      - FROM service-instance( service-instance BelongsTo service-subscription, MANY2ONE)(1)
+
+      -(1) IF this SERVICE-SUBSCRIPTION node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this SERVICE-SUBSCRIPTION is DELETED also
     required:
     - service-type
     properties:
@@ -67382,9 +61460,11 @@ getDefinitions:
   site-pair:
     description: |
       ###### Related Nodes
-      - TO routing-instance( site-pair org.onap.relationships.inventory.BelongsTo routing-instance, MANY2ONE)
-      - FROM class-of-service( class-of-service org.onap.relationships.inventory.BelongsTo site-pair, MANY2ONE)
-      - SITE-PAIR is DELETED when these are DELETED CLASS-OF-SERVICE
+      - TO routing-instance( site-pair BelongsTo routing-instance, MANY2ONE)(4)
+      - FROM class-of-service( class-of-service BelongsTo site-pair, MANY2ONE)(1)
+
+      -(1) IF this SITE-PAIR node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this SITE-PAIR is DELETED also
     required:
     - site-pair-id
     properties:
@@ -67421,9 +61501,10 @@ getDefinitions:
     description: |
       Set of instances for probes used to measure service level agreements
       ###### Related Nodes
-      - TO generic-vnf( site-pair-set org.onap.relationships.inventory.AppliesTo generic-vnf, MANY2MANY)
-      - FROM routing-instance( routing-instance org.onap.relationships.inventory.BelongsTo site-pair-set, MANY2ONE)
-      - SITE-PAIR-SET is DELETED when these are DELETED ROUTING-INSTANCE
+      - TO generic-vnf( site-pair-set AppliesTo generic-vnf, MANY2MANY)
+      - FROM routing-instance( routing-instance BelongsTo site-pair-set, MANY2ONE)(1)
+
+      -(1) IF this SITE-PAIR-SET node is deleted, this FROM node is DELETED also
     required:
     - site-pair-set-id
     properties:
@@ -67461,8 +61542,9 @@ getDefinitions:
     description: |
       Openstack snapshot
       ###### Related Nodes
-      - TO cloud-region( snapshot org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - FROM vserver( vserver org.onap.relationships.inventory.Uses snapshot, ONE2ONE)
+      - TO cloud-region( snapshot BelongsTo cloud-region, MANY2ONE)
+      - FROM vserver( vserver Uses snapshot, ONE2ONE)
+
     required:
     - snapshot-id
     properties:
@@ -67515,8 +61597,10 @@ getDefinitions:
     description: |
       SR-IOV Physical Function
       ###### Related Nodes
-      - TO p-interface( sriov-pf org.onap.relationships.inventory.BelongsTo p-interface, ONE2ONE)
-      - FROM sriov-vf( sriov-vf org.onap.relationships.inventory.Uses sriov-pf, MANY2ONE)
+      - TO p-interface( sriov-pf BelongsTo p-interface, ONE2ONE)(4)
+      - FROM sriov-vf( sriov-vf Uses sriov-pf, MANY2ONE)
+
+      -(4) IF this TO node is deleted, this SRIOV-PF is DELETED also
     required:
     - pf-pci-id
     properties:
@@ -67542,8 +61626,10 @@ getDefinitions:
     description: |
       SR-IOV Virtual Function (not to be confused with virtual network function)
       ###### Related Nodes
-      - TO l-interface( sriov-vf org.onap.relationships.inventory.BelongsTo l-interface, ONE2ONE)
-      - TO sriov-pf( sriov-vf org.onap.relationships.inventory.Uses sriov-pf, MANY2ONE)
+      - TO l-interface( sriov-vf BelongsTo l-interface, ONE2ONE)(4)
+      - TO sriov-pf( sriov-vf Uses sriov-pf, MANY2ONE)
+
+      -(4) IF this TO node is deleted, this SRIOV-VF is DELETED also
     required:
     - pci-id
     properties:
@@ -67610,14 +61696,17 @@ getDefinitions:
   subnet:
     description: |
       ###### Related Nodes
-      - TO l3-network( subnet org.onap.relationships.inventory.BelongsTo l3-network, MANY2ONE)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.network.MemberOf subnet, MANY2MANY)
-      - FROM host-route( host-route org.onap.relationships.inventory.BelongsTo subnet, MANY2ONE)
-      - FROM vip-ipv4-address-list( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - FROM vip-ipv6-address-list( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - SUBNET cannot be deleted if linked to L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST
-      - SUBNET is DELETED when these are DELETED HOST-ROUTE
+      - TO l3-network( subnet BelongsTo l3-network, MANY2ONE)(4)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list MemberOf subnet, MANY2MANY)
+      - FROM host-route( host-route BelongsTo subnet, MANY2ONE)(1)
+      - FROM vip-ipv4-address-list( vip-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - FROM vip-ipv6-address-list( vip-ipv6-address-list MemberOf subnet, MANY2MANY)
+
+      -(1) IF this SUBNET node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this SUBNET is DELETED also
+      -SUBNET cannot be deleted if related to L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST,VIP-IPV4-ADDRESS-LIST,VIP-IPV6-ADDRESS-LIST
+
     required:
     - subnet-id
     - dhcp-enabled
@@ -67648,6 +61737,7 @@ getDefinitions:
         description: Orchestration status of this VNF, mastered by MSO
       dhcp-enabled:
         type: boolean
+        description: dhcp enabled
       dhcp-start:
         type: string
         description: the start address reserved for use by dhcp
@@ -67691,13 +61781,15 @@ getDefinitions:
     description: |
       Openstack tenant
       ###### Related Nodes
-      - TO cloud-region( tenant org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO group-assignment( tenant org.onap.relationships.inventory.MemberOf group-assignment, MANY2MANY)
-      - TO l3-network( tenant org.onap.relationships.inventory.Uses l3-network, MANY2MANY)
-      - TO volume-group( tenant org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
-      - FROM service-subscription( service-subscription org.onap.relationships.inventory.Uses tenant, MANY2MANY)
-      - FROM vserver( vserver org.onap.relationships.inventory.BelongsTo tenant, MANY2ONE)
-      - TENANT cannot be deleted if linked to VSERVER
+      - TO cloud-region( tenant BelongsTo cloud-region, MANY2ONE)
+      - TO group-assignment( tenant MemberOf group-assignment, MANY2MANY)
+      - TO l3-network( tenant Uses l3-network, MANY2MANY)
+      - TO volume-group( tenant DependsOn volume-group, ONE2MANY)
+      - FROM service-subscription( service-subscription Uses tenant, MANY2MANY)
+      - FROM vserver( vserver BelongsTo tenant, MANY2ONE)
+
+      -TENANT cannot be deleted if related to VSERVER
+
     required:
     - tenant-id
     - tenant-name
@@ -67734,7 +61826,9 @@ getDefinitions:
     description: |
       Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted
       ###### Related Nodes
-      - TO allotted-resource( tunnel-xconnect org.onap.relationships.inventory.BelongsTo allotted-resource, ONE2ONE)
+      - TO allotted-resource( tunnel-xconnect BelongsTo allotted-resource, ONE2ONE)(4)
+
+      -(4) IF this TO node is deleted, this TUNNEL-XCONNECT is DELETED also
     required:
     - id
     properties:
@@ -67796,14 +61890,15 @@ getDefinitions:
     description: |
       Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.
       ###### Related Nodes
-      - TO availability-zone( vce org.onap.relationships.inventory.Uses availability-zone, MANY2MANY)
-      - TO complex( vce org.onap.relationships.inventory.LocatedIn complex, MANY2MANY)
-      - TO vserver( vce tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM entitlement( entitlement org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM license( license org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM port-group( port-group org.onap.relationships.inventory.BelongsTo vce, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf vce, ONE2MANY)
-      - VCE is DELETED when these are DELETED ENTITLEMENT,LICENSE,PORT-GROUP
+      - TO availability-zone( vce Uses availability-zone, MANY2MANY)
+      - TO complex( vce LocatedIn complex, MANY2MANY)
+      - TO vserver( vce HostedOn vserver, ONE2MANY)
+      - FROM entitlement( entitlement BelongsTo vce, MANY2ONE)(1)
+      - FROM license( license BelongsTo vce, MANY2ONE)(1)
+      - FROM port-group( port-group BelongsTo vce, MANY2ONE)(1)
+      - FROM service-instance( service-instance ComposedOf vce, ONE2MANY)
+
+      -(1) IF this VCE node is deleted, this FROM node is DELETED also
     required:
     - vnf-id
     - vnf-name
@@ -67894,13 +61989,16 @@ getDefinitions:
     description: |
       a deployment unit of VNFCs
       ###### Related Nodes
-      - TO generic-vnf( vf-module org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO l3-network( vf-module org.onap.relationships.inventory.DependsOn l3-network, MANY2MANY)
-      - TO vnfc( vf-module org.onap.relationships.inventory.Uses vnfc, ONE2MANY)
-      - TO volume-group( vf-module org.onap.relationships.inventory.Uses volume-group, ONE2ONE)
-      - TO vserver( vf-module org.onap.relationships.inventory.Uses vserver, ONE2MANY)
-      - TO model-ver( vf-module org.onap.relationships.inventory.IsA model-ver, Many2One)
-      - VF-MODULE cannot be deleted if linked to VNFC
+      - TO generic-vnf( vf-module BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO l3-network( vf-module DependsOn l3-network, MANY2MANY)
+      - TO vnfc( vf-module Uses vnfc, ONE2MANY)
+      - TO volume-group( vf-module Uses volume-group, ONE2ONE)
+      - TO vserver( vf-module Uses vserver, ONE2MANY)
+      - TO model-ver( vf-module IsA model-ver, Many2One)
+
+      -(4) IF this TO node is deleted, this VF-MODULE is DELETED also
+      -VF-MODULE cannot be deleted if related to VNFC
+
     required:
     - vf-module-id
     - is-base-vf-module
@@ -67919,6 +62017,7 @@ getDefinitions:
         description: orchestration status of this vf-module, mastered by MSO
       is-base-vf-module:
         type: boolean
+        description: used to indicate whether or not this object is base vf module
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -67966,7 +62065,9 @@ getDefinitions:
     description: |
       vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607
       ###### Related Nodes
-      - TO ipsec-configuration( vig-server org.onap.relationships.inventory.BelongsTo ipsec-configuration, MANY2ONE)
+      - TO ipsec-configuration( vig-server BelongsTo ipsec-configuration, MANY2ONE)(4)
+
+      -(4) IF this TO node is deleted, this VIG-SERVER is DELETED also
     required:
     - vig-address-type
     properties:
@@ -67996,10 +62097,11 @@ getDefinitions:
     description: |
       IPv4 Address Range
       ###### Related Nodes
-      - TO cloud-region( vip-ipv4-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO instance-group( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO subnet( vip-ipv4-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.Uses vip-ipv4-address-list, MANY2MANY)
+      - TO cloud-region( vip-ipv4-address-list BelongsTo cloud-region, MANY2ONE)
+      - TO instance-group( vip-ipv4-address-list MemberOf instance-group, MANY2MANY)
+      - TO subnet( vip-ipv4-address-list MemberOf subnet, MANY2MANY)
+      - FROM vnfc( vnfc Uses vip-ipv4-address-list, MANY2MANY)
+
     required:
     - vip-ipv4-address
     properties:
@@ -68038,10 +62140,11 @@ getDefinitions:
     description: |
       IPv6 Address Range
       ###### Related Nodes
-      - TO cloud-region( vip-ipv6-address-list org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO instance-group( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO subnet( vip-ipv6-address-list org.onap.relationships.inventory.MemberOf subnet, MANY2MANY)
-      - FROM vnfc( vnfc org.onap.relationships.inventory.Uses vip-ipv6-address-list, MANY2MANY)
+      - TO cloud-region( vip-ipv6-address-list BelongsTo cloud-region, MANY2ONE)
+      - TO instance-group( vip-ipv6-address-list MemberOf instance-group, MANY2MANY)
+      - TO subnet( vip-ipv6-address-list MemberOf subnet, MANY2MANY)
+      - FROM vnfc( vnfc Uses vip-ipv6-address-list, MANY2MANY)
+
     required:
     - vip-ipv6-address
     properties:
@@ -68080,9 +62183,10 @@ getDefinitions:
     description: |
       Virtual organization of cloud infrastructure elements in a data center context
       ###### Related Nodes
-      - FROM connector( connector org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.LocatedIn virtual-data-center, MANY2MANY)
+      - FROM connector( connector LocatedIn virtual-data-center, MANY2MANY)
+      - FROM generic-vnf( generic-vnf LocatedIn virtual-data-center, MANY2MANY)
+      - FROM logical-link( logical-link LocatedIn virtual-data-center, MANY2MANY)
+
     required:
     - vdc-id
     - vdc-name
@@ -68112,15 +62216,17 @@ getDefinitions:
     description: |
       Definition of vlan
       ###### Related Nodes
-      - TO l-interface( vlan tosca.relationships.network.LinksTo l-interface, MANY2ONE)
-      - TO logical-link( vlan org.onap.relationships.inventory.Uses logical-link, MANY2MANY)
-      - TO multicast-configuration( vlan org.onap.relationships.inventory.Uses multicast-configuration, MANY2MANY)
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.PartOf vlan, MANY2MANY)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.ComposedOf vlan, ONE2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vlan, MANY2ONE)
-      - VLAN is DELETED when these are DELETED L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST
-      - VLAN deletion means associated objects of these types are also DELETED:LOGICAL-LINK
+      - TO l-interface( vlan LinksTo l-interface, MANY2ONE)(4)
+      - TO logical-link( vlan Uses logical-link, MANY2MANY)(2)
+      - TO multicast-configuration( vlan Uses multicast-configuration, MANY2MANY)
+      - FROM allotted-resource( allotted-resource PartOf vlan, MANY2MANY)
+      - FROM service-instance( service-instance ComposedOf vlan, ONE2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list BelongsTo vlan, MANY2ONE)(1)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list BelongsTo vlan, MANY2ONE)(1)
+
+      -(1) IF this VLAN node is deleted, this FROM node is DELETED also
+      -(2) IF this VLAN node is deleted, this TO node is DELETED also
+      -(4) IF this TO node is deleted, this VLAN is DELETED also
     required:
     - vlan-interface
     - in-maint
@@ -68160,11 +62266,13 @@ getDefinitions:
         description: Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C.
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       prov-status:
         type: string
         description: Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV].
       is-ip-unnumbered:
         type: boolean
+        description: Flag indicating the interface uses the IP Unnumbered configuration.
       relationship-list:
         type: array
         items:
@@ -68196,8 +62304,10 @@ getDefinitions:
     description: |
       Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.
       ###### Related Nodes
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.Uses vnf-image, MANY2ONE)
-      - VNF-IMAGE cannot be deleted if linked to GENERIC-VNF
+      - FROM generic-vnf( generic-vnf Uses vnf-image, MANY2ONE)
+
+      -VNF-IMAGE cannot be deleted if related to GENERIC-VNF
+
     required:
     - vnf-image-uuid
     - application
@@ -68236,15 +62346,17 @@ getDefinitions:
   vnfc:
     description: |
       ###### Related Nodes
-      - TO generic-vnf( vnfc org.onap.relationships.inventory.BelongsTo generic-vnf, MANY2ONE)
-      - TO instance-group( vnfc org.onap.relationships.inventory.MemberOf instance-group, MANY2MANY)
-      - TO vip-ipv4-address-list( vnfc org.onap.relationships.inventory.Uses vip-ipv4-address-list, MANY2MANY)
-      - TO vip-ipv6-address-list( vnfc org.onap.relationships.inventory.Uses vip-ipv6-address-list, MANY2MANY)
-      - TO vserver( vnfc tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.Uses vnfc, ONE2MANY)
-      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
-      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list org.onap.relationships.inventory.BelongsTo vnfc, MANY2ONE)
-      - VNFC is DELETED when these are DELETED L3-INTERFACE-IPV4-ADDRESS-LIST,L3-INTERFACE-IPV6-ADDRESS-LIST
+      - TO generic-vnf( vnfc BelongsTo generic-vnf, MANY2ONE)(4)
+      - TO instance-group( vnfc MemberOf instance-group, MANY2MANY)
+      - TO vip-ipv4-address-list( vnfc Uses vip-ipv4-address-list, MANY2MANY)
+      - TO vip-ipv6-address-list( vnfc Uses vip-ipv6-address-list, MANY2MANY)
+      - TO vserver( vnfc HostedOn vserver, ONE2MANY)
+      - FROM vf-module( vf-module Uses vnfc, ONE2MANY)
+      - FROM l3-interface-ipv4-address-list( l3-interface-ipv4-address-list BelongsTo vnfc, MANY2ONE)(1)
+      - FROM l3-interface-ipv6-address-list( l3-interface-ipv6-address-list BelongsTo vnfc, MANY2ONE)(1)
+
+      -(1) IF this VNFC node is deleted, this FROM node is DELETED also
+      -(4) IF this TO node is deleted, this VNFC is DELETED also
     required:
     - vnfc-name
     - nfc-naming-code
@@ -68272,8 +62384,10 @@ getDefinitions:
         description: Oam V4 vip address of this vnfc
       in-maint:
         type: boolean
+        description: used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
       is-closed-loop-disabled:
         type: boolean
+        description: used to indicate whether closed loop function is enabled on this node
       group-notation:
         type: string
         description: Group notation of VNFC
@@ -68310,7 +62424,9 @@ getDefinitions:
     description: |
       Ephemeral Block storage volume.
       ###### Related Nodes
-      - FROM vserver (PARENT of volume, vserver tosca.relationships.AttachesTo volume)
+      - FROM vserver (PARENT of volume, vserver AttachesTo volume)(3)
+
+      -(3) IF this FROM node is deleted, this VOLUME is DELETED also
     required:
     - volume-id
     - volume-selflink
@@ -68332,11 +62448,12 @@ getDefinitions:
     description: |
       Persistent block-level storage.
       ###### Related Nodes
-      - TO cloud-region( volume-group org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
-      - TO complex( volume-group org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM generic-vnf( generic-vnf org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.Uses volume-group, ONE2ONE)
-      - FROM tenant( tenant org.onap.relationships.inventory.DependsOn volume-group, ONE2MANY)
+      - TO cloud-region( volume-group BelongsTo cloud-region, MANY2ONE)
+      - TO complex( volume-group LocatedIn complex, MANY2ONE)
+      - FROM generic-vnf( generic-vnf DependsOn volume-group, ONE2MANY)
+      - FROM vf-module( vf-module Uses volume-group, ONE2ONE)
+      - FROM tenant( tenant DependsOn volume-group, ONE2MANY)
+
     required:
     - volume-group-id
     - volume-group-name
@@ -68390,11 +62507,12 @@ getDefinitions:
     description: |
       VPLS Provider Edge routers.
       ###### Related Nodes
-      - TO complex( vpls-pe org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - TO ctag-pool( vpls-pe org.onap.relationships.inventory.Uses ctag-pool, MANY2MANY)
-      - FROM lag-interface( lag-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - FROM p-interface( p-interface tosca.relationships.network.BindsTo vpls-pe, MANY2ONE)
-      - VPLS-PE is DELETED when these are DELETED LAG-INTERFACE,P-INTERFACE
+      - TO complex( vpls-pe LocatedIn complex, MANY2ONE)
+      - TO ctag-pool( vpls-pe Uses ctag-pool, MANY2MANY)
+      - FROM lag-interface( lag-interface BindsTo vpls-pe, MANY2ONE)(1)
+      - FROM p-interface( p-interface BindsTo vpls-pe, MANY2ONE)(1)
+
+      -(1) IF this VPLS-PE node is deleted, this FROM node is DELETED also
     required:
     - equipment-name
     properties:
@@ -68440,12 +62558,14 @@ getDefinitions:
     description: |
       VPN binding
       ###### Related Nodes
-      - FROM allotted-resource( allotted-resource org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2MANY)
-      - FROM l3-network( l3-network org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - FROM logical-link( logical-link org.onap.relationships.inventory.Uses vpn-binding, MANY2MANY)
-      - FROM route-target( route-target org.onap.relationships.inventory.BelongsTo vpn-binding, MANY2ONE)
-      - VPN-BINDING cannot be deleted if linked to ALLOTTED-RESOURCE,L3-NETWORK,LOGICAL-LINK
-      - VPN-BINDING is DELETED when these are DELETED ROUTE-TARGET
+      - FROM allotted-resource( allotted-resource BelongsTo vpn-binding, MANY2MANY)
+      - FROM l3-network( l3-network Uses vpn-binding, MANY2MANY)
+      - FROM logical-link( logical-link Uses vpn-binding, MANY2MANY)
+      - FROM route-target( route-target BelongsTo vpn-binding, MANY2ONE)(1)
+
+      -(1) IF this VPN-BINDING node is deleted, this FROM node is DELETED also
+      -VPN-BINDING cannot be deleted if related to ALLOTTED-RESOURCE,L3-NETWORK,LOGICAL-LINK
+
     required:
     - vpn-id
     - vpn-name
@@ -68493,19 +62613,20 @@ getDefinitions:
     description: |
       Virtual Servers, aka virtual machine or VM.
       ###### Related Nodes
-      - TO tenant( vserver org.onap.relationships.inventory.BelongsTo tenant, MANY2ONE)
-      - TO flavor( vserver org.onap.relationships.inventory.Uses flavor, MANY2ONE)
-      - TO image( vserver org.onap.relationships.inventory.Uses image, MANY2ONE)
-      - TO pserver( vserver tosca.relationships.HostedOn pserver, MANY2ONE)
-      - TO snapshot( vserver org.onap.relationships.inventory.Uses snapshot, ONE2ONE)
-      - TO volume (CHILD of vserver, vserver tosca.relationships.AttachesTo volume, ONE2MANY)
-      - FROM generic-vnf( generic-vnf tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM vce( vce tosca.relationships.HostedOn vserver, ONE2MANY)
-      - FROM l-interface( l-interface tosca.relationships.network.BindsTo vserver, MANY2ONE)
-      - FROM vf-module( vf-module org.onap.relationships.inventory.Uses vserver, ONE2MANY)
-      - FROM vnfc( vnfc tosca.relationships.HostedOn vserver, ONE2MANY)
-      - VSERVER is DELETED when these are DELETED L-INTERFACE
-      - VSERVER deletion means associated objects of these types are also DELETED:VOLUME
+      - TO tenant( vserver BelongsTo tenant, MANY2ONE)
+      - TO flavor( vserver Uses flavor, MANY2ONE)
+      - TO image( vserver Uses image, MANY2ONE)
+      - TO pserver( vserver HostedOn pserver, MANY2ONE)
+      - TO snapshot( vserver Uses snapshot, ONE2ONE)
+      - TO volume (CHILD of vserver, vserver AttachesTo volume, ONE2MANY)(2)
+      - FROM generic-vnf( generic-vnf HostedOn vserver, ONE2MANY)
+      - FROM vce( vce HostedOn vserver, ONE2MANY)
+      - FROM l-interface( l-interface BindsTo vserver, MANY2ONE)(1)
+      - FROM vf-module( vf-module Uses vserver, ONE2MANY)
+      - FROM vnfc( vnfc HostedOn vserver, ONE2MANY)
+
+      -(1) IF this VSERVER node is deleted, this FROM node is DELETED also
+      -(2) IF this VSERVER node is deleted, this TO node is DELETED also
     required:
     - vserver-id
     - vserver-name
@@ -68530,8 +62651,10 @@ getDefinitions:
         description: URL to endpoint where AAI can get more details
       in-maint:
         type: boolean
+        description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.
       is-closed-loop-disabled:
         type: boolean
+        description: Used to indicate whether closed loop function is enabled on this node
       resource-version:
         type: string
         description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -68559,11 +62682,12 @@ getDefinitions:
     description: |
       A zone is a grouping of assets in a location homing to the same connections into the CBB
       ###### Related Nodes
-      - TO complex( zone org.onap.relationships.inventory.LocatedIn complex, MANY2ONE)
-      - FROM cloud-region( cloud-region org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM pnf( pnf org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM pserver( pserver org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
-      - FROM service-instance( service-instance org.onap.relationships.inventory.LocatedIn zone, MANY2ONE)
+      - TO complex( zone LocatedIn complex, MANY2ONE)
+      - FROM cloud-region( cloud-region LocatedIn zone, MANY2ONE)
+      - FROM pnf( pnf LocatedIn zone, MANY2ONE)
+      - FROM pserver( pserver LocatedIn zone, MANY2ONE)
+      - FROM service-instance( service-instance LocatedIn zone, MANY2ONE)
+
     required:
     - zone-id
     - zone-name