Fix html docs with esr-system-info attr

[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 22919ea..e80df86 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,7 @@ paths:
          - CloudInfrastructure
        summary: delete an existing relationship
        description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImageRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignmentRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -6263,19 +5488,19 @@ 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__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/metadata/metadatum/{metaname}:
+          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 metadatum
-      description: returns metadatum
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
+      summary: returns group-assignment
+      description: returns group-assignment
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
        produces:
          - application/json
          - application/xml
@@ -6283,7 +5508,7 @@ paths:
          "200":
            description: successful operation
            schema:
-              $ref: "#/getDefinitions/metadatum"
+              $ref: "#/getDefinitions/group-assignment"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -6299,56 +5524,21 @@ paths:
            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
+        - name: group-id
            in: path
+          description: Group id, expected to be unique across cloud-region.
            required: true
            type: string
-          example: __METANAME__
-        - 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
+          example: __GROUP-ID__
      put:
        tags:
          - CloudInfrastructure
-      summary: create or update an existing metadatum
+      summary: create or update an existing group-assignment
        description: |
-        Create or update an existing metadatum.
+        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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
        consumes:
          - application/json
          - application/xml
@@ -6371,29 +5561,24 @@ paths:
            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
+        - name: group-id
            in: path
+          description: Group id, expected to be unique across cloud-region.
            required: true
            type: string
-          example: __METANAME__
+          example: __GROUP-ID__
          - name: body
            in: body
-          description: metadatum object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum.json)
+          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/metadatum"
+            $ref: "#/definitions/group-assignment"
      patch:
        tags:
          - CloudInfrastructure
-      summary: update an existing metadatum
+      summary: update an existing group-assignment
        description: |
-        Update an existing metadatum
+        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.
@@ -6404,7 +5589,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: UpdateCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
        consumes:
          - application/json
          - application/xml
@@ -6427,29 +5612,24 @@ paths:
            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
+        - name: group-id
            in: path
+          description: Group id, expected to be unique across cloud-region.
            required: true
            type: string
-          example: __METANAME__
+          example: __GROUP-ID__
          - name: body
            in: body
-          description: metadatum object that needs to be created or updated. 
+          description: group-assignment object that needs to be updated.
            required: true
            schema:
-            $ref: "#/patchDefinitions/metadatum"
+            $ref: "#/patchDefinitions/group-assignment"
      delete:
        tags:
          - CloudInfrastructure
-      summary: delete an existing metadatum
-      description: delete an existing metadatum
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
+      summary: delete an existing group-assignment
+      description: delete an existing group-assignment
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment
        consumes:
          - application/json
          - application/xml
@@ -6472,29 +5652,24 @@ paths:
            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
+        - name: group-id
            in: path
+          description: Group id, expected to be unique across cloud-region.
            required: true
            type: string
-          example: __METANAME__
+          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}/images/image/{image-id}/metadata:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments:
      get:
        tags:
          - CloudInfrastructure
-      summary: returns metadata
-      description: returns metadata
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadata
+      summary: returns group-assignments
+      description: returns group-assignments
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionGroupAssignments
        produces:
          - application/json
          - application/xml
@@ -6502,7 +5677,7 @@ paths:
          "200":
            description: successful operation
            schema:
-              $ref: "#/getDefinitions/metadata"
+              $ref: "#/getDefinitions/group-assignments"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -6518,49 +5693,102 @@ paths:
            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: cloud-type
+        - name: group-id
            in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
            required: false
            type: string
-        - name: owner-defined-type
+        - name: group-type
            in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          description:
            required: false
            type: string
-        - name: image-name
+        - name: group-name
            in: query
-          description: Image name
+          description:
            required: false
            type: string
-        - name: application
-          in: query
-          description: The application that the image instantiates.
-          required: false
+  /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
-        - name: application-vendor
-          in: query
-          description: The vendor of the application.
-          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: application-version
-          in: query
-          description: The version of the application.
-          required: false
+          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
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}:
+          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 image
-      description: returns image
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionImagesImage
+      summary: returns snapshot
+      description: returns snapshot
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
        produces:
          - application/json
          - application/xml
@@ -6568,7 +5796,7 @@ paths:
          "200":
            description: successful operation
            schema:
-              $ref: "#/getDefinitions/image"
+              $ref: "#/getDefinitions/snapshot"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -6584,51 +5812,21 @@ 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: 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
+          example: __SNAPSHOT-ID__
      put:
        tags:
          - CloudInfrastructure
-      summary: create or update an existing image
+      summary: create or update an existing snapshot
        description: |
-        Create or update an existing image.
+        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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionImagesImage
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
        consumes:
          - application/json
          - application/xml
@@ -6651,24 +5849,24 @@ 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__
+          example: __SNAPSHOT-ID__
          - name: body
            in: body
-          description: image object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionImagesImage.json)
+          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/image"
+            $ref: "#/definitions/snapshot"
      patch:
        tags:
          - CloudInfrastructure
-      summary: update an existing image
+      summary: update an existing snapshot
        description: |
-        Update an existing image
+        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.
@@ -6679,7 +5877,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: UpdateCloudInfrastructureCloudRegionsCloudRegionImagesImage
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
        consumes:
          - application/json
          - application/xml
@@ -6702,24 +5900,24 @@ 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__
+          example: __SNAPSHOT-ID__
          - name: body
            in: body
-          description: image object that needs to be created or updated. 
+          description: snapshot object that needs to be updated.
            required: true
            schema:
-            $ref: "#/patchDefinitions/image"
+            $ref: "#/patchDefinitions/snapshot"
      delete:
        tags:
          - CloudInfrastructure
-      summary: delete an existing image
-      description: delete an existing image
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImage
+      summary: delete an existing snapshot
+      description: delete an existing snapshot
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
        consumes:
          - application/json
          - application/xml
@@ -6742,24 +5940,24 @@ 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__
+          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}/images:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots:
      get:
        tags:
          - CloudInfrastructure
-      summary: returns images
-      description: returns images
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionImages
+      summary: returns snapshots
+      description: returns snapshots
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionSnapshots
        produces:
          - application/json
          - application/xml
@@ -6767,7 +5965,7 @@ paths:
          "200":
            description: successful operation
            schema:
-              $ref: "#/getDefinitions/images"
+              $ref: "#/getDefinitions/snapshots"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -6783,22 +5981,42 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: cloud-type
+        - name: snapshot-id
            in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
            required: false
            type: string
-        - name: owner-defined-type
+        - name: snapshot-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}/dvs-switches/dvs-switch/{switch-name}/relationship-list/relationship:
+        - 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
+        - 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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitchRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionImagesImageRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -6821,15 +6039,15 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: image-id
            in: path
-          description: DVS switch name
+          description: Image id, expected to be unique across cloud region
            required: true
            type: string
-          example: __SWITCH-NAME__
+          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/CloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch.json)
+          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"
@@ -6838,7 +6056,7 @@ paths:
          - CloudInfrastructure
        summary: delete an existing relationship
        description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitchRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImageRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -6861,19 +6079,19 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: image-id
            in: path
-          description: DVS switch name
+          description: Image id, expected to be unique across cloud region
            required: true
            type: string
-          example: __SWITCH-NAME__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name}:
+          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 dvs-switch
-      description: returns dvs-switch
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      summary: returns metadatum
+      description: returns metadatum
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
        produces:
          - application/json
          - application/xml
@@ -6881,7 +6099,7 @@ paths:
          "200":
            description: successful operation
            schema:
-              $ref: "#/getDefinitions/dvs-switch"
+              $ref: "#/getDefinitions/metadatum"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -6897,36 +6115,26 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: image-id
            in: path
-          description: DVS switch name
+          description: Image id, expected to be unique across cloud region
            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
+          example: __IMAGE-ID__
+        - name: metaname
+          in: path
+          required: true
            type: string
+          example: __METANAME__
      put:
        tags:
          - CloudInfrastructure
-      summary: create or update an existing dvs-switch
+      summary: create or update an existing metadatum
        description: |
-        Create or update an existing dvs-switch.
+        Create or update an existing metadatum.
          #
          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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
        consumes:
          - application/json
          - application/xml
@@ -6949,24 +6157,29 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: image-id
            in: path
-          description: DVS switch name
+          description: Image id, expected to be unique across cloud region
            required: true
            type: string
-          example: __SWITCH-NAME__
+          example: __IMAGE-ID__
+        - name: metaname
+          in: path
+          required: true
+          type: string
+          example: __METANAME__
          - name: body
            in: body
-          description: dvs-switch object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch.json)
+          description: metadatum object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum.json)
            required: true
            schema:
-            $ref: "#/definitions/dvs-switch"
+            $ref: "#/definitions/metadatum"
      patch:
        tags:
          - CloudInfrastructure
-      summary: update an existing dvs-switch
+      summary: update an existing metadatum
        description: |
-        Update an existing dvs-switch
+        Update an existing metadatum
          #
          Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
          The PUT operation will entirely replace an existing object.
@@ -6977,7 +6190,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: UpdateCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
        consumes:
          - application/json
          - application/xml
@@ -7000,24 +6213,29 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: image-id
            in: path
-          description: DVS switch name
+          description: Image id, expected to be unique across cloud region
            required: true
            type: string
-          example: __SWITCH-NAME__
+          example: __IMAGE-ID__
+        - name: metaname
+          in: path
+          required: true
+          type: string
+          example: __METANAME__
          - name: body
            in: body
-          description: dvs-switch object that needs to be created or updated. 
+          description: metadatum object that needs to be updated.
            required: true
            schema:
-            $ref: "#/patchDefinitions/dvs-switch"
+            $ref: "#/patchDefinitions/metadatum"
      delete:
        tags:
          - CloudInfrastructure
-      summary: delete an existing dvs-switch
-      description: delete an existing dvs-switch
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      summary: delete an existing metadatum
+      description: delete an existing metadatum
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
        consumes:
          - application/json
          - application/xml
@@ -7040,32 +6258,1184 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: image-id
            in: path
-          description: DVS switch name
+          description: Image id, expected to be unique across cloud region
            required: true
            type: string
-          example: __SWITCH-NAME__
+          example: __IMAGE-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
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/metadata:
      get:
        tags:
          - CloudInfrastructure
-      summary: returns dvs-switches
-      description: returns dvs-switches
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionDvsSwitches
+      summary: returns metadata
+      description: returns metadata
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadata
+      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: 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: query
+          description:
+          required: false
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns image
+      description: returns image
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionImagesImage
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/image"
+        "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__
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing image
+      description: |
+        Create or update an existing image.
+        #
+        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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionImagesImage
+      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: image object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionImagesImage.json)
+          required: true
+          schema:
+            $ref: "#/definitions/image"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing image
+      description: |
+        Update an existing image
+        #
+        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: UpdateCloudInfrastructureCloudRegionsCloudRegionImagesImage
+      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: image object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/image"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing image
+      description: delete an existing image
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImage
+      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: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns images
+      description: returns images
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionImages
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/images"
+        "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: query
+          description:
+          required: false
+          type: string
+        - name: image-name
+          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
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name}/relationship-list/relationship:
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitchRelationshipListRelationship
+      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: switch-name
+          in: path
+          description: DVS switch name
+          required: true
+          type: string
+          example: __SWITCH-NAME__
+        - name: body
+          in: body
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitchRelationshipListRelationship
+      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: switch-name
+          in: path
+          description: DVS switch name
+          required: true
+          type: string
+          example: __SWITCH-NAME__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns dvs-switch
+      description: returns dvs-switch
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/dvs-switch"
+        "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: switch-name
+          in: path
+          description: DVS switch name
+          required: true
+          type: string
+          example: __SWITCH-NAME__
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing dvs-switch
+      description: |
+        Create or update an existing dvs-switch.
+        #
+        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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      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: switch-name
+          in: path
+          description: DVS switch name
+          required: true
+          type: string
+          example: __SWITCH-NAME__
+        - name: body
+          in: body
+          description: dvs-switch object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch.json)
+          required: true
+          schema:
+            $ref: "#/definitions/dvs-switch"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing dvs-switch
+      description: |
+        Update an existing dvs-switch
+        #
+        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: UpdateCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      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: switch-name
+          in: path
+          description: DVS switch name
+          required: true
+          type: string
+          example: __SWITCH-NAME__
+        - name: body
+          in: body
+          description: dvs-switch object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/dvs-switch"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing dvs-switch
+      description: delete an existing dvs-switch
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      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: switch-name
+          in: path
+          description: DVS switch name
+          required: true
+          type: string
+          example: __SWITCH-NAME__
+        - 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}/dvs-switches:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns dvs-switches
+      description: returns dvs-switches
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionDvsSwitches
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/dvs-switches"
+        "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: switch-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: vcenter-url
+          in: query
+          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:
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetworkRelationshipListRelationship
+      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: network-uuid
+          in: path
+          description: UUID of the network. Unique across a cloud-region
+          required: true
+          type: string
+          example: __NETWORK-UUID__
+        - name: body
+          in: body
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetworkRelationshipListRelationship
+      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: network-uuid
+          in: path
+          description: UUID of the network. Unique across a cloud-region
+          required: true
+          type: string
+          example: __NETWORK-UUID__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks/oam-network/{network-uuid}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns oam-network
+      description: returns oam-network
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/oam-network"
+        "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: network-uuid
+          in: path
+          description: UUID of the network. Unique across a cloud-region
+          required: true
+          type: string
+          example: __NETWORK-UUID__
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing oam-network
+      description: |
+        Create or update an existing oam-network.
+        #
+        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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork
+      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: network-uuid
+          in: path
+          description: UUID of the network. Unique across a cloud-region
+          required: true
+          type: string
+          example: __NETWORK-UUID__
+        - name: body
+          in: body
+          description: oam-network object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork.json)
+          required: true
+          schema:
+            $ref: "#/definitions/oam-network"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing oam-network
+      description: |
+        Update an existing oam-network
+        #
+        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: UpdateCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork
+      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: network-uuid
+          in: path
+          description: UUID of the network. Unique across a cloud-region
+          required: true
+          type: string
+          example: __NETWORK-UUID__
+        - name: body
+          in: body
+          description: oam-network object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/oam-network"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing oam-network
+      description: delete an existing oam-network
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork
+      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: network-uuid
+          in: path
+          description: UUID of the network. Unique across a cloud-region
+          required: true
+          type: string
+          example: __NETWORK-UUID__
+        - 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}/oam-networks:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns oam-networks
+      description: returns oam-networks
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionOamNetworks
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/oam-networks"
+        "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: network-uuid
+          in: query
+          description:
+          required: false
+          type: string
+        - name: network-name
+          in: query
+          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:
+        - CloudInfrastructure
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZoneRelationshipListRelationship
+      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: availability-zone-name
+          in: path
+          description: Name of the availability zone.  Unique across a cloud region
+          required: true
+          type: string
+          example: __AVAILABILITY-ZONE-NAME__
+        - name: body
+          in: body
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZoneRelationshipListRelationship
+      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: availability-zone-name
+          in: path
+          description: Name of the availability zone.  Unique across a cloud region
+          required: true
+          type: string
+          example: __AVAILABILITY-ZONE-NAME__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/availability-zones/availability-zone/{availability-zone-name}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns availability-zone
+      description: returns availability-zone
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/availability-zone"
+        "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: availability-zone-name
+          in: path
+          description: Name of the availability zone.  Unique across a cloud region
+          required: true
+          type: string
+          example: __AVAILABILITY-ZONE-NAME__
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing availability-zone
+      description: |
+        Create or update an existing availability-zone.
+        #
+        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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
+      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: availability-zone-name
+          in: path
+          description: Name of the availability zone.  Unique across a cloud region
+          required: true
+          type: string
+          example: __AVAILABILITY-ZONE-NAME__
+        - name: body
+          in: body
+          description: availability-zone object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone.json)
+          required: true
+          schema:
+            $ref: "#/definitions/availability-zone"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing availability-zone
+      description: |
+        Update an existing availability-zone
+        #
+        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: UpdateCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
+      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: availability-zone-name
+          in: path
+          description: Name of the availability zone.  Unique across a cloud region
+          required: true
+          type: string
+          example: __AVAILABILITY-ZONE-NAME__
+        - name: body
+          in: body
+          description: availability-zone object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/availability-zone"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing availability-zone
+      description: delete an existing availability-zone
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
+      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: availability-zone-name
+          in: path
+          description: Name of the availability zone.  Unique across a cloud region
+          required: true
+          type: string
+          example: __AVAILABILITY-ZONE-NAME__
+        - 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}/availability-zones:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns availability-zones
+      description: returns availability-zones
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionAvailabilityZones
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/availability-zones"
+        "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: availability-zone-name
+          in: query
+          description:
+          required: false
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/relationship-list/relationship:
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionRelationshipListRelationship
+      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: body
+          in: body
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegion.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
        produces:
          - application/json
          - application/xml
        responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/dvs-switches"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -7081,22 +7451,12 @@ 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}/oam-networks/oam-network/{network-uuid}/relationship-list/relationship:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv4-address-list/{vip-ipv4-address}/relationship-list/relationship:
      put:
        tags:
          - CloudInfrastructure
        summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetworkRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressListRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -7119,15 +7479,15 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: network-uuid
+        - name: vip-ipv4-address
            in: path
-          description: UUID of the network. Unique across a cloud-region
+          description: IP address
            required: true
            type: string
-          example: __NETWORK-UUID__
+          example: __VIP-IPV4-ADDRESS__
          - name: body
            in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork.json)
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList.json)
            required: true
            schema:
              $ref: "#/definitions/relationship"
@@ -7136,7 +7496,7 @@ paths:
          - CloudInfrastructure
        summary: delete an existing relationship
        description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetworkRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressListRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -7159,19 +7519,19 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: network-uuid
+        - name: vip-ipv4-address
            in: path
-          description: UUID of the network. Unique across a cloud-region
+          description: IP address
            required: true
            type: string
-          example: __NETWORK-UUID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks/oam-network/{network-uuid}:
+          example: __VIP-IPV4-ADDRESS__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv4-address-list/{vip-ipv4-address}:
      get:
        tags:
          - CloudInfrastructure
-      summary: returns oam-network
-      description: returns oam-network
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork
+      summary: returns vip-ipv4-address-list
+      description: returns vip-ipv4-address-list
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList
        produces:
          - application/json
          - application/xml
@@ -7179,7 +7539,7 @@ paths:
          "200":
            description: successful operation
            schema:
-              $ref: "#/getDefinitions/oam-network"
+              $ref: "#/getDefinitions/vip-ipv4-address-list"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -7195,42 +7555,21 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: network-uuid
+        - name: vip-ipv4-address
            in: path
-          description: UUID of the network. Unique across a cloud-region
+          description: IP address
            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
+          example: __VIP-IPV4-ADDRESS__
      put:
        tags:
          - CloudInfrastructure
-      summary: create or update an existing oam-network
+      summary: create or update an existing vip-ipv4-address-list
        description: |
-        Create or update an existing oam-network.
+        Create or update an existing vip-ipv4-address-list.
          #
          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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList
        consumes:
          - application/json
          - application/xml
@@ -7253,24 +7592,24 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: network-uuid
+        - name: vip-ipv4-address
            in: path
-          description: UUID of the network. Unique across a cloud-region
+          description: IP address
            required: true
            type: string
-          example: __NETWORK-UUID__
+          example: __VIP-IPV4-ADDRESS__
          - name: body
            in: body
-          description: oam-network object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork.json)
+          description: vip-ipv4-address-list object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList.json)
            required: true
            schema:
-            $ref: "#/definitions/oam-network"
+            $ref: "#/definitions/vip-ipv4-address-list"
      patch:
        tags:
          - CloudInfrastructure
-      summary: update an existing oam-network
+      summary: update an existing vip-ipv4-address-list
        description: |
-        Update an existing oam-network
+        Update an existing vip-ipv4-address-list
          #
          Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
          The PUT operation will entirely replace an existing object.
@@ -7281,7 +7620,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: UpdateCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList
        consumes:
          - application/json
          - application/xml
@@ -7304,24 +7643,24 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: network-uuid
+        - name: vip-ipv4-address
            in: path
-          description: UUID of the network. Unique across a cloud-region
+          description: IP address
            required: true
            type: string
-          example: __NETWORK-UUID__
+          example: __VIP-IPV4-ADDRESS__
          - name: body
            in: body
-          description: oam-network object that needs to be created or updated. 
+          description: vip-ipv4-address-list object that needs to be updated.
            required: true
            schema:
-            $ref: "#/patchDefinitions/oam-network"
+            $ref: "#/patchDefinitions/vip-ipv4-address-list"
      delete:
        tags:
          - CloudInfrastructure
-      summary: delete an existing oam-network
-      description: delete an existing oam-network
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork
+      summary: delete an existing vip-ipv4-address-list
+      description: delete an existing vip-ipv4-address-list
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList
        consumes:
          - application/json
          - application/xml
@@ -7344,63 +7683,23 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: network-uuid
+        - name: vip-ipv4-address
            in: path
-          description: UUID of the network. Unique across a cloud-region
+          description: IP address
            required: true
            type: string
-          example: __NETWORK-UUID__
+          example: __VIP-IPV4-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}/oam-networks:
-    get:
-      tags:
-        - CloudInfrastructure
-      summary: returns oam-networks
-      description: returns oam-networks
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionOamNetworks
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/oam-networks"
-        "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: 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}/availability-zones/availability-zone/{availability-zone-name}/relationship-list/relationship:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv6-address-list/{vip-ipv6-address}/relationship-list/relationship:
      put:
        tags:
          - CloudInfrastructure
        summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZoneRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressListRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -7423,15 +7722,15 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: availability-zone-name
+        - name: vip-ipv6-address
            in: path
-          description: Name of the availability zone.  Unique across a cloud region
+          description: IP address
            required: true
            type: string
-          example: __AVAILABILITY-ZONE-NAME__
+          example: __VIP-IPV6-ADDRESS__
          - name: body
            in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone.json)
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList.json)
            required: true
            schema:
              $ref: "#/definitions/relationship"
@@ -7440,7 +7739,7 @@ paths:
          - CloudInfrastructure
        summary: delete an existing relationship
        description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZoneRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressListRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -7463,19 +7762,19 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: availability-zone-name
+        - name: vip-ipv6-address
            in: path
-          description: Name of the availability zone.  Unique across a cloud region
+          description: IP address
            required: true
            type: string
-          example: __AVAILABILITY-ZONE-NAME__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/availability-zones/availability-zone/{availability-zone-name}:
+          example: __VIP-IPV6-ADDRESS__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv6-address-list/{vip-ipv6-address}:
      get:
        tags:
          - CloudInfrastructure
-      summary: returns availability-zone
-      description: returns availability-zone
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
+      summary: returns vip-ipv6-address-list
+      description: returns vip-ipv6-address-list
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
        produces:
          - application/json
          - application/xml
@@ -7483,7 +7782,7 @@ paths:
          "200":
            description: successful operation
            schema:
-              $ref: "#/getDefinitions/availability-zone"
+              $ref: "#/getDefinitions/vip-ipv6-address-list"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -7499,31 +7798,21 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: availability-zone-name
+        - name: vip-ipv6-address
            in: path
-          description: Name of the availability zone.  Unique across a cloud region
+          description: IP address
            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
+          example: __VIP-IPV6-ADDRESS__
      put:
        tags:
          - CloudInfrastructure
-      summary: create or update an existing availability-zone
+      summary: create or update an existing vip-ipv6-address-list
        description: |
-        Create or update an existing availability-zone.
+        Create or update an existing vip-ipv6-address-list.
          #
          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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
        consumes:
          - application/json
          - application/xml
@@ -7546,24 +7835,24 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: availability-zone-name
+        - name: vip-ipv6-address
            in: path
-          description: Name of the availability zone.  Unique across a cloud region
+          description: IP address
            required: true
            type: string
-          example: __AVAILABILITY-ZONE-NAME__
+          example: __VIP-IPV6-ADDRESS__
          - name: body
            in: body
-          description: availability-zone object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone.json)
+          description: vip-ipv6-address-list object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList.json)
            required: true
            schema:
-            $ref: "#/definitions/availability-zone"
+            $ref: "#/definitions/vip-ipv6-address-list"
      patch:
        tags:
          - CloudInfrastructure
-      summary: update an existing availability-zone
+      summary: update an existing vip-ipv6-address-list
        description: |
-        Update an existing availability-zone
+        Update an existing vip-ipv6-address-list
          #
          Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
          The PUT operation will entirely replace an existing object.
@@ -7574,7 +7863,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: UpdateCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
        consumes:
          - application/json
          - application/xml
@@ -7597,24 +7886,24 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: availability-zone-name
+        - name: vip-ipv6-address
            in: path
-          description: Name of the availability zone.  Unique across a cloud region
+          description: IP address
            required: true
            type: string
-          example: __AVAILABILITY-ZONE-NAME__
+          example: __VIP-IPV6-ADDRESS__
          - name: body
            in: body
-          description: availability-zone object that needs to be created or updated. 
+          description: vip-ipv6-address-list object that needs to be updated.
            required: true
            schema:
-            $ref: "#/patchDefinitions/availability-zone"
+            $ref: "#/patchDefinitions/vip-ipv6-address-list"
      delete:
        tags:
          - CloudInfrastructure
-      summary: delete an existing availability-zone
-      description: delete an existing availability-zone
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
+      summary: delete an existing vip-ipv6-address-list
+      description: delete an existing vip-ipv6-address-list
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
        consumes:
          - application/json
          - application/xml
@@ -7637,32 +7926,30 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: availability-zone-name
+        - name: vip-ipv6-address
            in: path
-          description: Name of the availability zone.  Unique across a cloud region
+          description: IP address
            required: true
            type: string
-          example: __AVAILABILITY-ZONE-NAME__
+          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}/availability-zones:
-    get:
+  /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: returns availability-zones
-      description: returns availability-zones
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionAvailabilityZones
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
        produces:
          - application/json
          - application/xml
        responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/availability-zones"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -7678,22 +7965,58 @@ 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: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
            type: string
-        - name: owner-defined-type
-          in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
+          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
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/relationship-list/relationship:
+          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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributesRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -7716,9 +8039,21 @@ paths:
            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/CloudInfrastructureCloudRegionsCloudRegion.json)
+          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"
@@ -7727,7 +8062,7 @@ paths:
          - CloudInfrastructure
        summary: delete an existing relationship
        description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributesRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -7750,12 +8085,69 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv4-address-list/{vip-ipv4-address}/relationship-list/relationship:
+        - 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: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressListRelationshipListRelationship
+      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
@@ -7778,24 +8170,41 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv4-address
+        - name: hpa-capability-id
            in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
            required: true
            type: string
-          example: __VIP-IPV4-ADDRESS__
+          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/CloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList.json)
+          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/relationship"
-    delete:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
        tags:
          - CloudInfrastructure
-      summary: delete an existing relationship
-      description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressListRelationshipListRelationship
+      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
@@ -7818,27 +8227,37 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv4-address
+        - name: hpa-capability-id
            in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
            required: true
            type: string
-          example: __VIP-IPV4-ADDRESS__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv4-address-list/{vip-ipv4-address}:
-    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__
+        - 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: returns vip-ipv4-address-list
-      description: returns vip-ipv4-address-list
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList
+      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:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/vip-ipv4-address-list"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -7854,47 +8273,68 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv4-address
+        - name: hpa-capability-id
            in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
            required: true
            type: string
-          example: __VIP-IPV4-ADDRESS__
-        - name: cloud-type
-          in: query
-          description: Type of the cloud (e.g., openstack)
-          required: false
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
            type: string
-        - name: owner-defined-type
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: resource-version
            in: query
-          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
-          required: false
+          description: resource-version for concurrency
+          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
+  /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
-        - name: neutron-subnet-id
-          in: query
-          description: Neutron id of subnet that address belongs to
-          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
+          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 vip-ipv4-address-list
+      summary: create or update an existing hpa-capability
        description: |
-        Create or update an existing vip-ipv4-address-list.
+        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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
        consumes:
          - application/json
          - application/xml
@@ -7917,24 +8357,24 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv4-address
+        - name: hpa-capability-id
            in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
            required: true
            type: string
-          example: __VIP-IPV4-ADDRESS__
+          example: __HPA-CAPABILITY-ID__
          - name: body
            in: body
-          description: vip-ipv4-address-list object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList.json)
+          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: "#/definitions/vip-ipv4-address-list"
+            $ref: "#/definitions/hpa-capability"
      patch:
        tags:
          - CloudInfrastructure
-      summary: update an existing vip-ipv4-address-list
+      summary: update an existing hpa-capability
        description: |
-        Update an existing vip-ipv4-address-list
+        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.
@@ -7945,7 +8385,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: UpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
        consumes:
          - application/json
          - application/xml
@@ -7968,24 +8408,24 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv4-address
+        - name: hpa-capability-id
            in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
            required: true
            type: string
-          example: __VIP-IPV4-ADDRESS__
+          example: __HPA-CAPABILITY-ID__
          - name: body
            in: body
-          description: vip-ipv4-address-list object that needs to be created or updated. 
+          description: hpa-capability object that needs to be updated.
            required: true
            schema:
-            $ref: "#/patchDefinitions/vip-ipv4-address-list"
+            $ref: "#/patchDefinitions/hpa-capability"
      delete:
        tags:
          - CloudInfrastructure
-      summary: delete an existing vip-ipv4-address-list
-      description: delete an existing vip-ipv4-address-list
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList
+      summary: delete an existing hpa-capability
+      description: delete an existing hpa-capability
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
        consumes:
          - application/json
          - application/xml
@@ -8008,23 +8448,68 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv4-address
+        - name: hpa-capability-id
            in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
            required: true
            type: string
-          example: __VIP-IPV4-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}/vip-ipv6-address-list/{vip-ipv6-address}/relationship-list/relationship:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns hpa-capabilities
+      description: returns hpa-capabilities
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionHpaCapabilities
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/hpa-capabilities"
+        "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: query
+          description:
+          required: false
+          type: string
+        - name: hpa-feature
+          in: query
+          description:
+          required: false
+          type: string
+        - name: architecture
+          in: query
+          description:
+          required: false
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/esr-system-info-list/esr-system-info/{esr-system-info-id}/relationship-list/relationship:
      put:
        tags:
          - CloudInfrastructure
        summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressListRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionEsrSystemInfoListEsrSystemInfoRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -8047,15 +8532,15 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: esr-system-info-id
            in: path
-          description: IP address
+          description: Unique ID of esr system info.
            required: true
            type: string
-          example: __VIP-IPV6-ADDRESS__
+          example: __ESR-SYSTEM-INFO-ID__
          - name: body
            in: body
-          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList.json)
+          description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionEsrSystemInfoListEsrSystemInfo.json)
            required: true
            schema:
              $ref: "#/definitions/relationship"
@@ -8064,7 +8549,7 @@ paths:
          - CloudInfrastructure
        summary: delete an existing relationship
        description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressListRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionEsrSystemInfoListEsrSystemInfoRelationshipListRelationship
        consumes:
          - application/json
          - application/xml
@@ -8087,19 +8572,19 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: esr-system-info-id
            in: path
-          description: IP address
+          description: Unique ID of esr system info.
            required: true
            type: string
-          example: __VIP-IPV6-ADDRESS__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/vip-ipv6-address-list/{vip-ipv6-address}:
+          example: __ESR-SYSTEM-INFO-ID__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/esr-system-info-list/esr-system-info/{esr-system-info-id}:
      get:
        tags:
          - CloudInfrastructure
-      summary: returns vip-ipv6-address-list
-      description: returns vip-ipv6-address-list
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
+      summary: returns esr-system-info
+      description: returns esr-system-info
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionEsrSystemInfoListEsrSystemInfo
        produces:
          - application/json
          - application/xml
@@ -8107,7 +8592,7 @@ paths:
          "200":
            description: successful operation
            schema:
-              $ref: "#/getDefinitions/vip-ipv6-address-list"
+              $ref: "#/getDefinitions/esr-system-info"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -8123,47 +8608,21 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: esr-system-info-id
            in: path
-          description: IP address
+          description: Unique ID of esr system info.
            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
+          example: __ESR-SYSTEM-INFO-ID__
      put:
        tags:
          - CloudInfrastructure
-      summary: create or update an existing vip-ipv6-address-list
+      summary: create or update an existing esr-system-info
        description: |
-        Create or update an existing vip-ipv6-address-list.
+        Create or update an existing esr-system-info.
          #
          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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionEsrSystemInfoListEsrSystemInfo
        consumes:
          - application/json
          - application/xml
@@ -8186,24 +8645,24 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: esr-system-info-id
            in: path
-          description: IP address
+          description: Unique ID of esr system info.
            required: true
            type: string
-          example: __VIP-IPV6-ADDRESS__
+          example: __ESR-SYSTEM-INFO-ID__
          - name: body
            in: body
-          description: vip-ipv6-address-list object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList.json)
+          description: esr-system-info object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionEsrSystemInfoListEsrSystemInfo.json)
            required: true
            schema:
-            $ref: "#/definitions/vip-ipv6-address-list"
+            $ref: "#/definitions/esr-system-info"
      patch:
        tags:
          - CloudInfrastructure
-      summary: update an existing vip-ipv6-address-list
+      summary: update an existing esr-system-info
        description: |
-        Update an existing vip-ipv6-address-list
+        Update an existing esr-system-info
          #
          Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
          The PUT operation will entirely replace an existing object.
@@ -8214,7 +8673,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: UpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionEsrSystemInfoListEsrSystemInfo
        consumes:
          - application/json
          - application/xml
@@ -8237,24 +8696,24 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: esr-system-info-id
            in: path
-          description: IP address
+          description: Unique ID of esr system info.
            required: true
            type: string
-          example: __VIP-IPV6-ADDRESS__
+          example: __ESR-SYSTEM-INFO-ID__
          - name: body
            in: body
-          description: vip-ipv6-address-list object that needs to be created or updated. 
+          description: esr-system-info object that needs to be updated.
            required: true
            schema:
-            $ref: "#/patchDefinitions/vip-ipv6-address-list"
+            $ref: "#/patchDefinitions/esr-system-info"
      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 esr-system-info
+      description: delete an existing esr-system-info
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionEsrSystemInfoListEsrSystemInfo
        consumes:
          - application/json
          - application/xml
@@ -8277,24 +8736,24 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: esr-system-info-id
            in: path
-          description: IP address
+          description: Unique ID of esr system info.
            required: true
            type: string
-          example: __VIP-IPV6-ADDRESS__
+          example: __ESR-SYSTEM-INFO-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}/esr-system-info-list:
      get:
        tags:
          - CloudInfrastructure
-      summary: returns cloud-region
-      description: returns cloud-region
-      operationId: getCloudInfrastructureCloudRegionsCloudRegion
+      summary: returns esr-system-info-list
+      description: returns esr-system-info-list
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionEsrSystemInfoList
        produces:
          - application/json
          - application/xml
@@ -8302,7 +8761,7 @@ paths:
          "200":
            description: successful operation
            schema:
-              $ref: "#/getDefinitions/cloud-region"
+              $ref: "#/getDefinitions/esr-system-info-list"
          "default":
            description: Response codes found in [response codes](https://wiki.onap.org/).
        parameters:
@@ -8318,16 +8777,51 @@ paths:
            required: true
            type: string
            example: __CLOUD-REGION-ID__
-        - name: cloud-type
+        - name: esr-system-info-id
            in: query
-          description: Type of the cloud (e.g., openstack)
+          description:
            required: false
            type: string
-        - name: owner-defined-type
+        - name: system-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: system-type
            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 +8900,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 +8954,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 +9115,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 +9163,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 +9391,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 +9481,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 +9554,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 +9791,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 +9905,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 +10106,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 +10220,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 +10317,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 +10419,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 +10504,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 +10648,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 +10789,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 +11062,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 +11164,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 +11341,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 +11443,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 +11528,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 +11618,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 +11691,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 +11741,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 +11819,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 +11880,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 +12184,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 +12298,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 +12499,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 +12613,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 +12710,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 +12812,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 +12850,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 +13041,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 +13143,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 +13228,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 +13455,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 +13557,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 +13734,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 +13836,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 +13921,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 +14011,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 +14084,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 +14134,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 +14212,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 +14273,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 +14312,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 +14378,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 +14426,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 +14526,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 +14592,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 +14640,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 +14791,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 +14839,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 +14924,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 +15000,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 +15060,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 +15089,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 +15155,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 +15203,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 +15344,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 +15444,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 +15482,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 +15679,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 +15793,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 +15890,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 +16023,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 +16125,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 +16210,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 +16271,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 +16361,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 +16434,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 +16576,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 +16654,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 +16715,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 +16794,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 +16860,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 +16908,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 +17064,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 +17112,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 +17258,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 +17306,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 +17452,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 +17500,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 +17646,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 +17694,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 +17774,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 +17840,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 +17888,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 +17983,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 +18049,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 +18097,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 +18278,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 +18332,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 +18495,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 +18613,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 +18715,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 +18857,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 +18965,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 +19008,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 +19102,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 +19200,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 +19282,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 +19394,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 +19482,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 +19554,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 +19594,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 +19682,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 +19754,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 +19851,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 +19929,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 +19990,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 +20084,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 +20150,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 +20198,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 +20310,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 +20394,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 +20462,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 +20500,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 +20584,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 +20652,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 +20743,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 +20817,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 +20875,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 +20951,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 +21015,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 +21062,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 +21147,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 +21213,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 +21261,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 +21537,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 +21622,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 +21827,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 +21900,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 +22075,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 +22136,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 +22281,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 +22329,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 +22445,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 +22535,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 +22602,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 +22676,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 +22742,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 +22790,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 +23021,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 +23109,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 +23180,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 +23412,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 +23524,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 +23721,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 +23833,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 +23928,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 +24028,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 +24066,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 +24252,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 +24352,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 +24435,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 +24657,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 +24757,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 +24930,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 +25030,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 +25113,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 +25201,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 +25272,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 +25321,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 +25397,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 +25456,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 +25753,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 +25865,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 +26062,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 +26174,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 +26269,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 +26369,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 +26452,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 +26593,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 +26693,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 +26776,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 +26998,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 +27098,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 +27271,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 +27371,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 +27454,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 +27542,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 +27613,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 +27662,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 +27738,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 +27797,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 +27835,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 +27899,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 +27946,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 +28097,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 +28145,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 +28264,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 +28356,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 +28430,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 +28528,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 +28606,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 +28667,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 +28797,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 +28887,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 +28954,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 +29074,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 +29164,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 +29231,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 +29315,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 +29381,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 +29429,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 +29617,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 +29695,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 +29824,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 +29902,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 +29963,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 +30029,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 +30077,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 +30238,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 +30328,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 +30401,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 +30498,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 +30576,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 +30637,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 +30742,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 +30822,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 +30884,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 +30982,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 +31060,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 +31121,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 +31200,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 +31266,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 +31314,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 +31439,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 +31505,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 +31553,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 +31816,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 +31918,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 +32095,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 +32197,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 +32282,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 +32372,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 +32445,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 +32571,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 +32661,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 +32734,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 +32931,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 +33021,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 +33174,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 +33264,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 +33337,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 +33415,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 +33476,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 +33790,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 +33904,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 +34081,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 +34219,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 +34316,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 +34418,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 +34503,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 +34647,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 +34749,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 +34834,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 +35045,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 +35163,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 +35340,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 +35442,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 +35527,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 +35617,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 +35690,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 +35740,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 +35818,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 +35879,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 +35986,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 +36064,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 +36125,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.
-          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
+          description:
            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 +36275,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 +36365,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 +36432,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 +36552,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 +36642,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 +36709,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,203 +36743,211 @@ paths:
            required: true
            type: string
            example: __VNF-ID__
+    put:
+      tags:
+        - Network
+      summary: create or update an existing generic-vnf
+      description: |
+        Create or update an existing generic-vnf.
+        #
+        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: createOrUpdateNetworkGenericVnfsGenericVnf
+      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-id
+          in: path
+          description: Unique id of VNF.  This is unique across the graph.
+          required: true
+          type: string
+          example: __VNF-ID__
+        - name: body
+          in: body
+          description: generic-vnf object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/NetworkGenericVnfsGenericVnf.json)
+          required: true
+          schema:
+            $ref: "#/definitions/generic-vnf"
+    patch:
+      tags:
+        - Network
+      summary: update an existing generic-vnf
+      description: |
+        Update an existing generic-vnf
+        #
+        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: UpdateNetworkGenericVnfsGenericVnf
+      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-id
+          in: path
+          description: Unique id of VNF.  This is unique across the graph.
+          required: true
+          type: string
+          example: __VNF-ID__
+        - name: body
+          in: body
+          description: generic-vnf object that needs to be updated.
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/generic-vnf"
+    delete:
+      tags:
+        - Network
+      summary: delete an existing generic-vnf
+      description: delete an existing generic-vnf
+      operationId: deleteNetworkGenericVnfsGenericVnf
+      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-id
+          in: path
+          description: Unique id of VNF.  This is unique across the graph.
+          required: true
+          type: string
+          example: __VNF-ID__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /network/generic-vnfs:
+    get:
+      tags:
+        - Network
+      summary: returns generic-vnfs
+      description: returns generic-vnfs
+      operationId: getNetworkGenericVnfs
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $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: Name of VNF.
+          description:
            required: false
            type: string
          - name: vnf-name2
            in: query
-          description: Alternate name of VNF.
+          description:
            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.
+          description:
            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
+          description:
            required: false
            type: string
          - name: regional-resource-zone
            in: query
-          description: Regional way of organizing pservers, source of truth should define values
+          description:
            required: false
            type: string
          - name: prov-status
            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
+          description:
            required: false
            type: boolean
          - name: is-closed-loop-disabled
            in: query
+          description:
            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
+          description:
            required: false
            type: string
          - name: nf-function
            in: query
-          description: English description of Network function that the specific VNF deployment is providing
+          description:
            required: false
            type: string
          - name: nf-role
            in: query
-          description: role in the network that this model will be providing
+          description:
            required: false
            type: string
          - name: nf-naming-code
            in: query
-          description: string assigned to this model used for naming purposes
+          description:
            required: false
            type: string
-    put:
-      tags:
-        - Network
-      summary: create or update an existing generic-vnf
-      description: |
-        Create or update an existing generic-vnf.
-        #
-        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: createOrUpdateNetworkGenericVnfsGenericVnf
-      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-id
-          in: path
-          description: Unique id of VNF.  This is unique across the graph.
-          required: true
-          type: string
-          example: __VNF-ID__
-        - name: body
-          in: body
-          description: generic-vnf object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/NetworkGenericVnfsGenericVnf.json)
-          required: true
-          schema:
-            $ref: "#/definitions/generic-vnf"
-    patch:
-      tags:
-        - Network
-      summary: update an existing generic-vnf
-      description: |
-        Update an existing generic-vnf
-        #
-        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: UpdateNetworkGenericVnfsGenericVnf
-      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-id
-          in: path
-          description: Unique id of VNF.  This is unique across the graph.
-          required: true
-          type: string
-          example: __VNF-ID__
-        - name: body
-          in: body
-          description: generic-vnf object that needs to be created or updated. 
-          required: true
-          schema:
-            $ref: "#/patchDefinitions/generic-vnf"
-    delete:
-      tags:
-        - Network
-      summary: delete an existing generic-vnf
-      description: delete an existing generic-vnf
-      operationId: deleteNetworkGenericVnfsGenericVnf
-      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-id
-          in: path
-          description: Unique id of VNF.  This is unique across the graph.
-          required: true
-          type: string
-          example: __VNF-ID__
-        - name: resource-version
-          in: query
-          description: resource-version for concurrency
-          required: true
-          type: string
-  /network/generic-vnfs:
-    get:
-      tags:
-        - Network
-      summary: returns generic-vnfs
-      description: returns generic-vnfs
-      operationId: getNetworkGenericVnfs
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/generic-vnfs"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
    /network/lag-links/lag-link/{link-name}/relationship-list/relationship:
      put:
        tags:
@@ -42266,7 +37088,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 +37136,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 +37394,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 +37496,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 +37673,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 +37775,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"
@@ -43119,104 +37813,53 @@ paths:
            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: resource-version
-          in: query
-          description: resource-version for concurrency
-          required: true
-          type: string
-  /network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}:
-    get:
-      tags:
-        - Network
-      summary: returns vlan
-      description: returns vlan
-      operationId: getNetworkNewvcesNewvceLInterfacesLInterfaceVlansVlan
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/vlan"
-        "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: vlan-interface
-          in: path
-          description: String that identifies the interface
-          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
+        - name: l3-interface-ipv6-address
+          in: path
+          description: IP address
+          required: true
            type: string
-        - name: interface-id
+          example: __L3-INTERFACE-IPV6-ADDRESS__
+        - name: resource-version
            in: query
-          description: ID of interface
-          required: false
+          description: resource-version for concurrency
+          required: true
            type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
+  /network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}:
+    get:
+      tags:
+        - Network
+      summary: returns vlan
+      description: returns vlan
+      operationId: getNetworkNewvcesNewvceLInterfacesLInterfaceVlansVlan
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/vlan"
+        "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: network-name
-          in: query
-          description: Name of the network
-          required: false
+          example: __VNF-ID2__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          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: __INTERFACE-NAME__
+        - name: vlan-interface
+          in: path
+          description: String that identifies the interface
+          required: true
            type: string
+          example: __VLAN-INTERFACE__
      put:
        tags:
          - Network
@@ -43307,7 +37950,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 +38023,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:
@@ -43530,66 +38149,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: 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: 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
@@ -43680,7 +38239,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 +38312,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 +38509,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 +38599,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 +38752,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 +38842,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 +38915,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 +38993,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 +39054,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 +39098,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 +39164,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 +39212,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 +39465,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 +39555,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 +39628,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 +39865,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 +39979,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 +40180,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 +40294,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 +40391,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 +40493,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 +40578,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 +40722,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 +40824,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 +40909,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 +41136,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 +41238,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 +41415,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 +41517,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 +41602,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 +41692,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 +41765,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: 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/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}:
@@ -47728,16 +41815,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 +41893,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 +41954,14 @@ paths:
            required: true
            type: string
            example: __PNF-NAME__
-        - name: inv-status
+        - name: interface-name
+          in: query
+          description:
+          required: false
+          type: string
+        - name: prov-status
            in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
+          description:
            required: false
            type: string
    /network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/relationship-list/relationship:
@@ -48176,63 +42258,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 +42372,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 +42573,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 +42687,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"
@@ -48763,100 +42731,59 @@ paths:
            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: resource-version
-          in: query
-          description: resource-version for concurrency
-          required: true
-          type: string
-  /network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}:
-    get:
-      tags:
-        - Network
-      summary: returns vlan
-      description: returns vlan
-      operationId: getNetworkPnfsPnfLagInterfacesLagInterfaceLInterfacesLInterfaceVlansVlan
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/vlan"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: pnf-name
-          in: path
-          description: unique name of Physical Network Function.
-          required: true
-          type: string
-          example: __PNF-NAME__
-        - 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: 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
+        - name: l3-interface-ipv6-address
+          in: path
+          description: IP address
+          required: true
            type: string
-        - name: interface-role
+          example: __L3-INTERFACE-IPV6-ADDRESS__
+        - name: resource-version
            in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
+          description: resource-version for concurrency
+          required: true
            type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
+  /network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}:
+    get:
+      tags:
+        - Network
+      summary: returns vlan
+      description: returns vlan
+      operationId: getNetworkPnfsPnfLagInterfacesLagInterfaceLInterfacesLInterfaceVlansVlan
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/vlan"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: pnf-name
+          in: path
+          description: unique name of Physical Network Function.
+          required: true
            type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
+          example: __PNF-NAME__
+        - name: interface-name
+          in: path
+          description: Name that identifies the link aggregate interface
+          required: true
            type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
+          example: __INTERFACE-NAME__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          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: __INTERFACE-NAME__
+        - name: vlan-interface
+          in: path
+          description: String that identifies the interface
+          required: true
            type: string
+          example: __VLAN-INTERFACE__
      put:
        tags:
          - Network
@@ -48959,7 +42886,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 +42971,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 +43115,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 +43217,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 +43302,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 +43529,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 +43631,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 +43808,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 +43910,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"
@@ -50182,83 +43948,53 @@ paths:
            required: true
            type: string
            example: __INTERFACE-NAME__
-        - name: l3-interface-ipv6-address
-          in: path
-          description: IP address
-          required: true
-          type: string
-          example: __L3-INTERFACE-IPV6-ADDRESS__
-        - name: resource-version
-          in: query
-          description: resource-version for concurrency
-          required: true
-          type: string
-  /network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}:
-    get:
-      tags:
-        - Network
-      summary: returns l-interface
-      description: returns l-interface
-      operationId: getNetworkPnfsPnfLagInterfacesLagInterfaceLInterfacesLInterface
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "200":
-          description: successful operation
-          schema:
-              $ref: "#/getDefinitions/l-interface"
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: pnf-name
-          in: path
-          description: unique name of Physical Network Function.
-          required: true
-          type: string
-          example: __PNF-NAME__
-        - 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
-          type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
+        - name: l3-interface-ipv6-address
+          in: path
+          description: IP address
+          required: true
            type: string
-        - name: interface-role
+          example: __L3-INTERFACE-IPV6-ADDRESS__
+        - name: resource-version
            in: query
-          description: Role assigned to this Interface, should use values as defined in ECOMP Yang models.
-          required: false
+          description: resource-version for concurrency
+          required: true
            type: string
-        - name: interface-id
-          in: query
-          description: ID of interface
-          required: false
+  /network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}:
+    get:
+      tags:
+        - Network
+      summary: returns l-interface
+      description: returns l-interface
+      operationId: getNetworkPnfsPnfLagInterfacesLagInterfaceLInterfacesLInterface
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/l-interface"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: pnf-name
+          in: path
+          description: unique name of Physical Network Function.
+          required: true
            type: string
-        - name: macaddr
-          in: query
-          description: MAC address for the interface
-          required: false
+          example: __PNF-NAME__
+        - name: interface-name
+          in: path
+          description: Name that identifies the link aggregate interface
+          required: true
            type: string
-        - name: network-name
-          in: query
-          description: Name of the network
-          required: false
+          example: __INTERFACE-NAME__
+        - name: interface-name
+          in: path
+          description: Name given to the interface
+          required: true
            type: string
+          example: __INTERFACE-NAME__
      put:
        tags:
          - Network
@@ -50349,7 +44085,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 +44158,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:
+          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/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{interface-name}:
@@ -50467,21 +44208,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 +44286,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 +44347,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:
+          required: false
+          type: string
+        - name: interface-role
            in: query
-          description: CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.
+          description:
            required: false
            type: string
    /network/pnfs/pnf/{pnf-name}:
@@ -50650,11 +44386,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 +44452,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 +44500,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 +44585,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 +44651,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 +44699,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 +44930,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 +44991,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 +45086,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 +45134,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 +45214,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 +45280,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 +45328,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 +45413,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 +45479,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 +45527,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 +45622,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 +45688,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 +45736,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 +45831,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 +45907,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 +45967,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 +46064,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 +46142,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 +46203,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 +46295,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 +46373,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 +46434,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 +46458,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 +46524,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 +46572,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 +46733,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 +46813,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 +46875,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 +46905,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 +46971,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 +47019,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 +47059,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 +47133,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 +47212,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:
@@ -53540,28 +47272,30 @@ definitions:
            $ref: "#/definitions/operational-environment"
    cloud-region:
      description: |
-      cloud-region designates an installation of a cloud cluster or region or instantiation. In cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname
-      ###### 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
+      cloud-region designates an installation of a cloud cluster or region or instantiation.
+      ###### Related Nodes
+      - 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 +47327,13 @@ 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.
+      cloud-epa-caps:
+        type: string
+        description: MultiVIM will discover and expose EPA capabilities.
        resource-version:
          type: string
          description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -53644,6 +47385,15 @@ 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
+      esr-system-info-list:
+        type: array
+        items:
+          $ref: "#/definitions/esr-system-info"
    cloud-regions:
      properties:
        cloud-region:
@@ -53654,20 +47404,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
@@ -53735,25 +47487,31 @@ definitions:
            $ref: "#/definitions/complex"
    configuration:
      description: |
-      Generic configuration object.
-      ###### 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
+      Port Mirror Configuration.
+      ###### Related Nodes
+      - 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
      - configuration-sub-type
+    - orchestration-status
+    - operational-status
+    - configuration-selflink
+    - model-customization-id
      properties:
        configuration-id:
          type: string
@@ -53825,10 +47583,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:
@@ -53873,10 +47632,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
@@ -53907,8 +47668,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:
@@ -53933,10 +47696,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
@@ -53971,8 +47736,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
@@ -54031,8 +47797,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
@@ -54108,9 +47875,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
@@ -54141,8 +47910,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
@@ -54172,8 +47943,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:
@@ -54199,10 +47971,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
@@ -54270,8 +48044,9 @@ definitions:
          type: string
          description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
        relationship-list:
-        type: object
-        $ref: "#/definitions/relationship-list"
+        type: array
+        items:
+          $ref: "#/definitions/relationship"
    esr-system-info-list:
      description: |
        Collection of persistent block-level external system auth info.
@@ -54284,9 +48059,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:
@@ -54318,8 +48094,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:
@@ -54351,7 +48128,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:
@@ -54441,9 +48220,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
@@ -54454,7 +48236,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
@@ -54483,6 +48265,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.
@@ -54502,12 +48289,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:
@@ -54529,7 +48318,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:
@@ -54571,11 +48362,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
@@ -54610,44 +48403,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:
@@ -54751,8 +48541,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.
@@ -54863,9 +48655,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
@@ -54901,7 +48694,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
@@ -54932,15 +48727,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
@@ -55013,22 +48877,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
@@ -55092,13 +48954,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:
@@ -55143,9 +49001,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:
@@ -55239,26 +49098,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
@@ -55294,16 +49155,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.
@@ -55343,12 +49207,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:
@@ -55387,12 +49253,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:
@@ -55431,24 +49299,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
@@ -55477,6 +49346,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
@@ -55522,10 +49392,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.
@@ -55559,17 +49432,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
@@ -55600,6 +49475,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:
@@ -55620,8 +49496,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:
@@ -55647,8 +49525,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
@@ -55678,7 +49558,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:
@@ -55704,24 +49585,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
@@ -55732,6 +49616,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
@@ -55810,11 +49695,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
@@ -55830,13 +49717,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
@@ -55879,9 +49768,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
@@ -55907,14 +49798,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
@@ -55957,18 +49850,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
@@ -56021,7 +49917,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
@@ -56061,10 +49958,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
@@ -56094,13 +49992,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:
@@ -56229,8 +50129,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:
@@ -56254,7 +50155,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:
@@ -56283,8 +50185,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
@@ -56348,6 +50251,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:
@@ -56403,9 +50312,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
@@ -56447,8 +50357,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
@@ -56543,7 +50454,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
@@ -56565,17 +50477,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
@@ -56607,11 +50521,15 @@ definitions:
        prov-status:
          type: string
          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+      mac-addresss:
+        type: string
+        description: MAC Address of the p-interface.
        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)
        inv-status:
          type: string
          description: inventory status
@@ -56639,7 +50557,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:
@@ -56697,7 +50617,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:
@@ -56723,17 +50644,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
@@ -56773,6 +50695,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.
@@ -56830,9 +50753,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
@@ -56888,7 +50813,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:
@@ -56922,7 +50848,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
@@ -56949,19 +50877,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
@@ -57031,6 +50960,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.
@@ -57083,7 +51013,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
@@ -57194,7 +51126,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
@@ -57224,7 +51157,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
@@ -57253,9 +51188,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:
@@ -57336,7 +51273,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:
@@ -57396,9 +51335,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
@@ -57444,37 +51385,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
@@ -57572,10 +51510,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:
@@ -57615,9 +51555,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:
@@ -57654,9 +51596,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:
@@ -57694,8 +51637,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:
@@ -57748,8 +51692,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:
@@ -57775,8 +51721,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:
@@ -57843,14 +51791,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
@@ -57881,6 +51832,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
@@ -57924,13 +51876,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
@@ -57967,7 +51921,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:
@@ -58029,14 +51985,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
@@ -58127,13 +52084,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
@@ -58152,6 +52112,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.
@@ -58199,7 +52160,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:
@@ -58229,10 +52192,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:
@@ -58271,10 +52235,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:
@@ -58313,9 +52278,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
@@ -58345,15 +52311,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
@@ -58393,11 +52361,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:
@@ -58429,8 +52399,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
@@ -58469,15 +52441,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
@@ -58505,8 +52479,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
@@ -58543,7 +52519,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
@@ -58565,11 +52543,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
@@ -58623,11 +52602,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:
@@ -58673,12 +52653,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
@@ -58726,19 +52708,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
@@ -58763,8 +52746,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.
@@ -58792,11 +52777,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
@@ -58834,12 +52820,6 @@ definitions:
          items:          
            $ref: "#/definitions/zone"
  patchDefinitions:
-  aai-internal:
-    properties:
-      property-name:
-        type: string
-      property-value:
-        type: string
    action:
      properties:
        action-type:
@@ -58868,21 +52848,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:
@@ -58916,15 +52899,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
@@ -58985,7 +52971,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:
@@ -59036,28 +53024,30 @@ patchDefinitions:
            $ref: "#/patchDefinitions/operational-environment"
    cloud-region:
      description: |
-      cloud-region designates an installation of a cloud cluster or region or instantiation. In cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname
-      ###### 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
+      cloud-region designates an installation of a cloud cluster or region or instantiation.
+      ###### Related Nodes
+      - 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
@@ -59089,6 +53079,13 @@ 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.
+      cloud-epa-caps:
+        type: string
+        description: MultiVIM will discover and expose EPA capabilities.
    cloud-regions:
      properties:
        cloud-region:
@@ -59099,20 +53096,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
@@ -59144,25 +53143,31 @@ patchDefinitions:
            $ref: "#/patchDefinitions/complex"
    configuration:
      description: |
-      Generic configuration object.
-      ###### 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
+      Port Mirror Configuration.
+      ###### Related Nodes
+      - 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
      - configuration-sub-type
+    - orchestration-status
+    - operational-status
+    - configuration-selflink
+    - model-customization-id
      properties:
        configuration-id:
          type: string
@@ -59215,10 +53220,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:
@@ -59237,10 +53243,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
@@ -59261,8 +53269,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:
@@ -59280,10 +53290,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
@@ -59311,8 +53323,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
@@ -59353,8 +53366,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
@@ -59423,9 +53437,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
@@ -59446,8 +53462,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
@@ -59470,8 +53488,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:
@@ -59488,10 +53507,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
@@ -59567,9 +53588,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:
@@ -59592,8 +53614,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:
@@ -59616,7 +53639,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:
@@ -59699,9 +53724,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
@@ -59712,7 +53740,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
@@ -59741,6 +53769,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.
@@ -59753,12 +53786,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:
@@ -59773,7 +53808,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:
@@ -59808,11 +53845,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
@@ -59833,44 +53872,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:
@@ -59974,8 +54010,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
@@ -59988,9 +54026,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
@@ -60019,7 +54058,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
@@ -60043,15 +54084,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
@@ -60113,22 +54205,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
@@ -60185,13 +54275,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:
@@ -60236,9 +54322,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:
@@ -60321,26 +54408,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
@@ -60376,6 +54465,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.
@@ -60388,12 +54478,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:
@@ -60419,12 +54511,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:
@@ -60450,24 +54544,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
@@ -60496,6 +54591,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
@@ -60513,17 +54609,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
@@ -60546,8 +54644,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:
@@ -60566,8 +54666,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
@@ -60590,7 +54692,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:
@@ -60609,24 +54712,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
@@ -60637,6 +54743,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
@@ -60672,11 +54779,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
@@ -60689,13 +54798,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
@@ -60727,9 +54838,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
@@ -60752,14 +54865,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
@@ -60785,18 +54900,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
@@ -60834,7 +54952,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
@@ -60867,10 +54986,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
@@ -60890,13 +55010,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:
@@ -61003,8 +55125,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:
@@ -61021,7 +55144,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:
@@ -61043,8 +55167,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
@@ -61085,6 +55210,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:
@@ -61140,9 +55271,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
@@ -61177,8 +55309,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
@@ -61257,7 +55390,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
@@ -61272,17 +55406,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
@@ -61314,6 +55450,9 @@ patchDefinitions:
        prov-status:
          type: string
          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+      mac-addresss:
+        type: string
+        description: MAC Address of the p-interface.
    p-interfaces:
      description: |
        Collection of physical interfaces.
@@ -61326,7 +55465,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:
@@ -61377,7 +55518,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:
@@ -61396,17 +55538,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
@@ -61446,6 +55589,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.
@@ -61482,9 +55626,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
@@ -61511,7 +55657,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:
@@ -61538,7 +55685,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
@@ -61563,19 +55712,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
@@ -61645,6 +55795,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.
@@ -61667,7 +55818,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
@@ -61770,7 +55923,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
@@ -61793,7 +55947,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
@@ -61815,9 +55971,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:
@@ -61887,7 +56045,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:
@@ -61930,9 +56090,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
@@ -61971,37 +56133,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
@@ -62078,10 +56237,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:
@@ -62110,9 +56271,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:
@@ -62138,9 +56301,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:
@@ -62167,8 +56331,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:
@@ -62214,8 +56379,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:
@@ -62234,8 +56401,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:
@@ -62292,14 +56461,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
@@ -62330,6 +56502,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
@@ -62358,13 +56531,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
@@ -62390,7 +56565,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:
@@ -62445,14 +56622,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
@@ -62518,13 +56696,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
@@ -62543,6 +56724,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
@@ -62555,7 +56737,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:
@@ -62578,10 +56762,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:
@@ -62607,10 +56792,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:
@@ -62636,9 +56822,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
@@ -62661,15 +56848,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
@@ -62705,8 +56894,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
@@ -62738,15 +56929,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
@@ -62774,8 +56967,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
@@ -62797,7 +56992,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
@@ -62812,11 +57009,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
@@ -62863,11 +57061,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:
@@ -62898,12 +57097,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
@@ -62939,19 +57140,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
@@ -62976,8 +57178,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.
@@ -62990,11 +57194,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
@@ -63025,12 +57230,6 @@ patchDefinitions:
          items:          
            $ref: "#/patchDefinitions/zone"
  getDefinitions:
-  aai-internal:
-    properties:
-      property-name:
-        type: string
-      property-value:
-        type: string
    action:
      properties:
        action-type:
@@ -63059,21 +57258,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:
@@ -63130,15 +57332,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
@@ -63206,7 +57411,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:
@@ -63264,28 +57471,30 @@ getDefinitions:
            $ref: "#/getDefinitions/operational-environment"
    cloud-region:
      description: |
-      cloud-region designates an installation of a cloud cluster or region or instantiation. In cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname
-      ###### 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
+      cloud-region designates an installation of a cloud cluster or region or instantiation.
+      ###### Related Nodes
+      - 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
@@ -63317,6 +57526,13 @@ 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.
+      cloud-epa-caps:
+        type: string
+        description: MultiVIM will discover and expose EPA capabilities.
        resource-version:
          type: string
          description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
@@ -63368,6 +57584,15 @@ 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
+      esr-system-info-list:
+        type: array
+        items:
+          $ref: "#/getDefinitions/esr-system-info"
    cloud-regions:
      properties:
        cloud-region:
@@ -63378,20 +57603,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
@@ -63459,25 +57686,31 @@ getDefinitions:
            $ref: "#/getDefinitions/complex"
    configuration:
      description: |
-      Generic configuration object.
-      ###### 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
+      Port Mirror Configuration.
+      ###### Related Nodes
+      - 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
      - configuration-sub-type
+    - orchestration-status
+    - operational-status
+    - configuration-selflink
+    - model-customization-id
      properties:
        configuration-id:
          type: string
@@ -63549,10 +57782,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:
@@ -63597,10 +57831,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
@@ -63631,8 +57867,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:
@@ -63657,10 +57895,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
@@ -63695,8 +57935,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
@@ -63755,8 +57996,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
@@ -63832,9 +58074,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
@@ -63865,8 +58109,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
@@ -63896,8 +58142,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:
@@ -63923,10 +58170,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
@@ -63994,8 +58243,9 @@ getDefinitions:
          type: string
          description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
        relationship-list:
-        type: object
-        $ref: "#/getDefinitions/relationship-list"
+        type: array
+        items:
+          $ref: "#/getDefinitions/relationship"
    esr-system-info-list:
      description: |
        Collection of persistent block-level external system auth info.
@@ -64008,9 +58258,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:
@@ -64042,8 +58293,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:
@@ -64075,7 +58327,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:
@@ -64165,9 +58419,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
@@ -64178,7 +58435,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
@@ -64207,6 +58464,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.
@@ -64226,12 +58488,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:
@@ -64253,7 +58517,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:
@@ -64295,11 +58561,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
@@ -64334,44 +58602,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:
@@ -64475,8 +58740,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.
@@ -64587,9 +58854,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
@@ -64625,7 +58893,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
@@ -64656,15 +58926,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
@@ -64737,22 +59076,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
@@ -64816,13 +59153,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:
@@ -64867,9 +59200,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:
@@ -64963,26 +59297,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
@@ -65018,16 +59354,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.
@@ -65067,12 +59406,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:
@@ -65111,12 +59452,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:
@@ -65155,24 +59498,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
@@ -65201,6 +59545,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
@@ -65246,10 +59591,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.
@@ -65283,17 +59631,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
@@ -65324,6 +59674,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:
@@ -65344,8 +59695,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:
@@ -65371,8 +59724,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
@@ -65402,7 +59757,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:
@@ -65428,24 +59784,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
@@ -65456,6 +59815,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
@@ -65534,11 +59894,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
@@ -65554,13 +59916,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
@@ -65603,9 +59967,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
@@ -65631,14 +59997,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
@@ -65681,18 +60049,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
@@ -65745,7 +60116,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
@@ -65785,10 +60157,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
@@ -65818,13 +60191,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:
@@ -65953,8 +60328,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:
@@ -65978,7 +60354,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:
@@ -66007,8 +60384,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
@@ -66072,6 +60450,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:
@@ -66127,9 +60511,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
@@ -66171,8 +60556,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
@@ -66267,7 +60653,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
@@ -66289,17 +60676,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
@@ -66331,11 +60720,15 @@ getDefinitions:
        prov-status:
          type: string
          description: Trigger for operational monitoring of this resource by Service Assurance systems.
+      mac-addresss:
+        type: string
+        description: MAC Address of the p-interface.
        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)
        inv-status:
          type: string
          description: inventory status
@@ -66363,7 +60756,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:
@@ -66421,7 +60816,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:
@@ -66447,17 +60843,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
@@ -66497,6 +60894,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.
@@ -66554,9 +60952,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
@@ -66612,7 +61012,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:
@@ -66646,7 +61047,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
@@ -66673,19 +61076,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
@@ -66755,6 +61159,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.
@@ -66807,7 +61212,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
@@ -66922,7 +61329,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
@@ -66952,7 +61360,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
@@ -66981,9 +61391,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:
@@ -67064,7 +61476,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:
@@ -67124,9 +61538,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
@@ -67172,37 +61588,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
@@ -67300,10 +61713,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:
@@ -67343,9 +61758,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:
@@ -67382,9 +61799,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:
@@ -67422,8 +61840,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:
@@ -67476,8 +61895,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:
@@ -67503,8 +61924,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:
@@ -67571,14 +61994,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
@@ -67609,6 +62035,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
@@ -67652,13 +62079,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
@@ -67695,7 +62124,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:
@@ -67757,14 +62188,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
@@ -67855,13 +62287,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
@@ -67880,6 +62315,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.
@@ -67927,7 +62363,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:
@@ -67957,10 +62395,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:
@@ -67999,10 +62438,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:
@@ -68041,9 +62481,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
@@ -68073,15 +62514,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
@@ -68121,11 +62564,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:
@@ -68157,8 +62602,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
@@ -68197,15 +62644,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
@@ -68233,8 +62682,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
@@ -68271,7 +62722,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
@@ -68293,11 +62746,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
@@ -68351,11 +62805,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:
@@ -68401,12 +62856,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
@@ -68454,19 +62911,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
@@ -68491,8 +62949,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.
@@ -68520,11 +62980,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