Update the license for 2017-2018 license

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

diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v12.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v12.yaml
index b1d047e..130578d 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
@@ -5276,12 +5276,12 @@ paths:
           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}/flavors/flavor/{flavor-id}/relationship-list/relationship:
+  /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 +5310,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 +5327,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -5350,21 +5356,25 @@ paths:
           required: true
           type: string
           example: __FLAVOR-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}:
-    get:
+        - 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}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship:
+    put:
       tags:
         - CloudInfrastructure
-      summary: returns flavor
-      description: returns flavor
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributesRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
       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:
@@ -5386,30 +5396,30 @@ paths:
           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
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
           type: string
-        - name: flavor-name
-          in: query
-          description: Flavor name
-          required: false
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
           type: string
-    put:
+          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/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/relationship"
+    delete:
       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: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributesRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -5438,36 +5448,33 @@ paths:
           required: true
           type: string
           example: __FLAVOR-ID__
-        - name: body
-          in: body
-          description: flavor object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor.json)
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
           required: true
-          schema:
-            $ref: "#/definitions/flavor"
-    patch:
+          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: 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
-      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:
@@ -5489,18 +5496,52 @@ 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__
+        - 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: Cloud region Flavor name
+          required: false
+          type: string
+        - name: hpa-feature
+          in: query
+          description: Name of the HPACapability
+          required: false
+          type: string
+        - name: architecture
+          in: query
+          description: Hardware architecture
+          required: false
+          type: string
+    put:
       tags:
         - CloudInfrastructure
-      summary: delete an existing flavor
-      description: delete an existing flavor
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor
+      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
@@ -5529,57 +5570,41 @@ paths:
           required: true
           type: string
           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}/flavors:
-    get:
-      tags:
-        - CloudInfrastructure
-      summary: returns flavors
-      description: returns flavors
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionFlavors
-      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:
-        - 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
+          description: UUID to uniquely identify a HPA capability
           required: true
           type: string
-          example: __CLOUD-OWNER__
-        - name: cloud-region-id
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
           in: path
-          description: Identifier used by the vendor for the region. Second part of composite key
+          description: name of the specific HPA attribute
           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}/group-assignments/group-assignment/{group-id}/relationship-list/relationship:
-    put:
+          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 +5627,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 created or 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 +5679,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 +5716,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,12 +5732,18 @@ 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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -5694,25 +5754,30 @@ paths:
           description: Cloud-owner defined type indicator (e.g., dcp, lcp)
           required: false
           type: string
-        - name: group-type
+        - name: flavor-name
           in: query
-          description: Group type - the type of group this instance refers to
+          description: Cloud region Flavor name
           required: false
           type: string
-        - name: group-name
+        - name: hpa-feature
           in: query
-          description: Group name - name assigned to the group
+          description: Name of the HPACapability
+          required: false
+          type: string
+        - name: architecture
+          in: query
+          description: Hardware architecture
           required: false
           type: string
     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 +5800,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 +5834,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 +5857,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 created or 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 +5903,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 +5934,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,6 +5950,12 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
+        - name: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
         - name: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -5877,12 +5966,17 @@ paths:
           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}/snapshots/snapshot/{snapshot-id}/relationship-list/relationship:
+        - name: flavor-name
+          in: query
+          description: Cloud region Flavor name
+          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 +5999,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 +6016,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshotRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -5945,19 +6039,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 +6059,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,12 +6075,12 @@ 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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -5997,40 +6091,20 @@ paths:
           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
+        - name: flavor-name
           in: query
-          description: This field contains the UUID of the previous snapshot (if any).
+          description: Cloud region Flavor name
           required: false
           type: string
     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 +6127,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 +6155,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 +6178,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 created or 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 +6218,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 +6243,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:
@@ -6195,12 +6269,12 @@ paths:
           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}/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 +6297,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 +6314,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImageRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignmentRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -6263,19 +6337,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 +6357,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,17 +6373,12 @@ 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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -6320,35 +6389,25 @@ paths:
           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
+        - name: group-type
           in: query
-          description: The vendor of the application.
+          description: Group type - the type of group this instance refers to
           required: false
           type: string
-        - name: application-version
+        - name: group-name
           in: query
-          description: The version of the application.
+          description: Group name - name assigned to the group
           required: false
           type: string
     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 +6430,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 +6458,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 +6481,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 created or 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 +6521,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 +6546,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,12 +6562,6 @@ 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
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -6534,33 +6572,87 @@ paths:
           description: Cloud-owner defined type indicator (e.g., dcp, lcp)
           required: false
           type: string
-        - name: image-name
-          in: query
-          description: Image name
-          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
-          in: query
-          description: The application that the image instantiates.
-          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-vendor
-          in: query
-          description: The vendor 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
-        - name: application-version
-          in: query
-          description: The version of the application.
-          required: false
+          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
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}:
+          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 +6660,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,12 +6676,12 @@ 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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -6600,9 +6692,9 @@ paths:
           description: Cloud-owner defined type indicator (e.g., dcp, lcp)
           required: false
           type: string
-        - name: image-name
+        - name: snapshot-name
           in: query
-          description: Image name
+          description: Snapshot name
           required: false
           type: string
         - name: application
@@ -6620,15 +6712,190 @@ paths:
           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
     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
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: snapshot-id
+          in: path
+          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          required: true
+          type: string
+          example: __SNAPSHOT-ID__
+        - name: body
+          in: body
+          description: snapshot object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot.json)
+          required: true
+          schema:
+            $ref: "#/definitions/snapshot"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing snapshot
+      description: |
+        Update an existing snapshot
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: snapshot-id
+          in: path
+          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          required: true
+          type: string
+          example: __SNAPSHOT-ID__
+        - name: body
+          in: body
+          description: snapshot object that needs to be created or updated. 
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/snapshot"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing snapshot
+      description: delete an existing snapshot
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionSnapshotsSnapshot
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: snapshot-id
+          in: path
+          description: Snapshot id, this is the key UUID assoc associated in glance with the snapshots.
+          required: true
+          type: string
+          example: __SNAPSHOT-ID__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/snapshots:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns snapshots
+      description: returns snapshots
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionSnapshots
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/snapshots"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __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}/images/image/{image-id}/relationship-list/relationship:
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: see node definition for valid relationships
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionImagesImageRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -6659,16 +6926,169 @@ paths:
           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)
+          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/image"
+            $ref: "#/definitions/relationship"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing relationship
+      description: delete an existing relationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImageRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: image-id
+          in: path
+          description: Image id, expected to be unique across cloud region
+          required: true
+          type: string
+          example: __IMAGE-ID__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/images/image/{image-id}/metadata/metadatum/{metaname}:
+    get:
+      tags:
+        - CloudInfrastructure
+      summary: returns metadatum
+      description: returns metadatum
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "200":
+          description: successful operation
+          schema:
+              $ref: "#/getDefinitions/metadatum"
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: image-id
+          in: path
+          description: Image id, expected to be unique across cloud region
+          required: true
+          type: string
+          example: __IMAGE-ID__
+        - name: metaname
+          in: path
+          required: true
+          type: string
+          example: __METANAME__
+        - name: cloud-type
+          in: query
+          description: Type of the cloud (e.g., openstack)
+          required: false
+          type: string
+        - name: owner-defined-type
+          in: query
+          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          required: false
+          type: string
+        - name: image-name
+          in: query
+          description: Image name
+          required: false
+          type: string
+        - name: application
+          in: query
+          description: The application that the image instantiates.
+          required: false
+          type: string
+        - name: application-vendor
+          in: query
+          description: The vendor of the application.
+          required: false
+          type: string
+        - name: application-version
+          in: query
+          description: The version of the application.
+          required: false
+          type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing metadatum
+      description: |
+        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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
+      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: metaname
+          in: path
+          required: true
+          type: string
+          example: __METANAME__
+        - name: body
+          in: body
+          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/metadatum"
     patch:
       tags:
         - CloudInfrastructure
-      summary: update an existing image
+      summary: update an existing metadatum
       description: |
-        Update an existing image
+        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.
@@ -6679,7 +7099,884 @@ 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: UpdateCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
+      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: metaname
+          in: path
+          required: true
+          type: string
+          example: __METANAME__
+        - name: body
+          in: body
+          description: metadatum object that needs to be created or updated. 
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/metadatum"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing metadatum
+      description: delete an existing metadatum
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImageMetadataMetadatum
+      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: 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}/images/image/{image-id}/metadata:
+    get:
+      tags:
+        - CloudInfrastructure
+      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: 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
+  /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__
+        - name: cloud-type
+          in: query
+          description: Type of the cloud (e.g., openstack)
+          required: false
+          type: string
+        - name: owner-defined-type
+          in: query
+          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          required: false
+          type: string
+        - name: image-name
+          in: query
+          description: Image name
+          required: false
+          type: string
+        - name: application
+          in: query
+          description: The application that the image instantiates.
+          required: false
+          type: string
+        - name: application-vendor
+          in: query
+          description: The vendor of the application.
+          required: false
+          type: string
+        - name: application-version
+          in: query
+          description: The version of the application.
+          required: false
+          type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      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 created or 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: 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}/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__
+        - name: cloud-type
+          in: query
+          description: Type of the cloud (e.g., openstack)
+          required: false
+          type: string
+        - name: owner-defined-type
+          in: query
+          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          required: false
+          type: string
+        - name: vcenter-url
+          in: query
+          description: URL used to reach the vcenter
+          required: false
+          type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      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 created or 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: 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:
+    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__
+        - name: cloud-type
+          in: query
+          description: Type of the cloud (e.g., openstack)
+          required: false
+          type: string
+        - name: owner-defined-type
+          in: query
+          description: Cloud-owner defined type indicator (e.g., dcp, lcp)
+          required: false
+          type: string
+        - name: network-name
+          in: query
+          description: Name of the network.
+          required: false
+          type: string
+        - name: cvlan-tag
+          in: query
+          description: cvlan-id
+          required: false
+          type: integer
+          format: int64
+    put:
+      tags:
+        - CloudInfrastructure
+      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
@@ -6702,24 +7999,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: image-id
+        - name: network-uuid
           in: path
-          description: Image id, expected to be unique across cloud region
+          description: UUID of the network. Unique across a cloud-region
           required: true
           type: string
-          example: __IMAGE-ID__
+          example: __NETWORK-UUID__
         - name: body
           in: body
-          description: image object that needs to be created or updated. 
+          description: oam-network object that needs to be created or updated. 
           required: true
           schema:
-            $ref: "#/patchDefinitions/image"
+            $ref: "#/patchDefinitions/oam-network"
     delete:
       tags:
         - CloudInfrastructure
-      summary: delete an existing image
-      description: delete an existing image
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionImagesImage
+      summary: delete an existing oam-network
+      description: delete an existing oam-network
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetwork
       consumes:
         - application/json
         - application/xml
@@ -6742,24 +8039,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: image-id
+        - name: network-uuid
           in: path
-          description: Image id, expected to be unique across cloud region
+          description: UUID of the network. Unique across a cloud-region
           required: true
           type: string
-          example: __IMAGE-ID__
+          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}/images:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks:
     get:
       tags:
         - CloudInfrastructure
-      summary: returns images
-      description: returns images
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionImages
+      summary: returns oam-networks
+      description: returns oam-networks
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionOamNetworks
       produces:
         - application/json
         - application/xml
@@ -6767,7 +8064,7 @@ paths:
         "200":
           description: successful operation
           schema:
-              $ref: "#/getDefinitions/images"
+              $ref: "#/getDefinitions/oam-networks"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -6793,12 +8090,12 @@ paths:
           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}/dvs-switches/dvs-switch/{switch-name}/relationship-list/relationship:
+  /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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitchRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZoneRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -6821,15 +8118,15 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: availability-zone-name
           in: path
-          description: DVS switch name
+          description: Name of the availability zone.  Unique across a cloud region
           required: true
           type: string
-          example: __SWITCH-NAME__
+          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/CloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch.json)
+          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"
@@ -6838,7 +8135,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitchRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZoneRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -6861,19 +8158,19 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: availability-zone-name
           in: path
-          description: DVS switch name
+          description: Name of the availability zone.  Unique across a 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: __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 dvs-switch
-      description: returns dvs-switch
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      summary: returns availability-zone
+      description: returns availability-zone
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
       produces:
         - application/json
         - application/xml
@@ -6881,7 +8178,7 @@ paths:
         "200":
           description: successful operation
           schema:
-              $ref: "#/getDefinitions/dvs-switch"
+              $ref: "#/getDefinitions/availability-zone"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -6897,12 +8194,12 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: availability-zone-name
           in: path
-          description: DVS switch name
+          description: Name of the availability zone.  Unique across a cloud region
           required: true
           type: string
-          example: __SWITCH-NAME__
+          example: __AVAILABILITY-ZONE-NAME__
         - name: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -6913,20 +8210,15 @@ paths:
           description: Cloud-owner defined type indicator (e.g., dcp, lcp)
           required: false
           type: string
-        - name: vcenter-url
-          in: query
-          description: URL used to reach the vcenter
-          required: false
-          type: string
     put:
       tags:
         - CloudInfrastructure
-      summary: create or update an existing dvs-switch
+      summary: create or update an existing availability-zone
       description: |
-        Create or update an existing dvs-switch.
+        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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
       consumes:
         - application/json
         - application/xml
@@ -6949,24 +8241,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: availability-zone-name
           in: path
-          description: DVS switch name
+          description: Name of the availability zone.  Unique across a cloud region
           required: true
           type: string
-          example: __SWITCH-NAME__
+          example: __AVAILABILITY-ZONE-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)
+          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/dvs-switch"
+            $ref: "#/definitions/availability-zone"
     patch:
       tags:
         - CloudInfrastructure
-      summary: update an existing dvs-switch
+      summary: update an existing availability-zone
       description: |
-        Update an existing dvs-switch
+        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.
@@ -6977,7 +8269,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: UpdateCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
       consumes:
         - application/json
         - application/xml
@@ -7000,24 +8292,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: availability-zone-name
           in: path
-          description: DVS switch name
+          description: Name of the availability zone.  Unique across a cloud region
           required: true
           type: string
-          example: __SWITCH-NAME__
+          example: __AVAILABILITY-ZONE-NAME__
         - name: body
           in: body
-          description: dvs-switch object that needs to be created or updated. 
+          description: availability-zone object that needs to be created or updated. 
           required: true
           schema:
-            $ref: "#/patchDefinitions/dvs-switch"
+            $ref: "#/patchDefinitions/availability-zone"
     delete:
       tags:
         - CloudInfrastructure
-      summary: delete an existing dvs-switch
-      description: delete an existing dvs-switch
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionDvsSwitchesDvsSwitch
+      summary: delete an existing availability-zone
+      description: delete an existing availability-zone
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZone
       consumes:
         - application/json
         - application/xml
@@ -7040,24 +8332,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: switch-name
+        - name: availability-zone-name
           in: path
-          description: DVS switch name
+          description: Name of the availability zone.  Unique across a cloud region
           required: true
           type: string
-          example: __SWITCH-NAME__
+          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}/dvs-switches:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/availability-zones:
     get:
       tags:
         - CloudInfrastructure
-      summary: returns dvs-switches
-      description: returns dvs-switches
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionDvsSwitches
+      summary: returns availability-zones
+      description: returns availability-zones
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionAvailabilityZones
       produces:
         - application/json
         - application/xml
@@ -7065,7 +8357,7 @@ paths:
         "200":
           description: successful operation
           schema:
-              $ref: "#/getDefinitions/dvs-switches"
+              $ref: "#/getDefinitions/availability-zones"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -7091,12 +8383,12 @@ paths:
           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}/relationship-list/relationship:
     put:
       tags:
         - CloudInfrastructure
       summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetworkRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -7119,15 +8411,77 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: network-uuid
+        - 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:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
           in: path
-          description: UUID of the network. Unique across a cloud-region
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
           required: true
           type: string
-          example: __NETWORK-UUID__
+          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__
+  /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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressListRelationshipListRelationship
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: vip-ipv4-address
+          in: path
+          description: IP address
+          required: true
+          type: string
+          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 +8490,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionOamNetworksOamNetworkRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressListRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -7159,19 +8513,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 +8533,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,12 +8549,12 @@ 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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -7211,26 +8565,31 @@ paths:
           description: Cloud-owner defined type indicator (e.g., dcp, lcp)
           required: false
           type: string
-        - name: network-name
+        - name: vlan-id-inner
           in: query
-          description: Name of the network.
+          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: cvlan-tag
+        - name: neutron-subnet-id
           in: query
-          description: cvlan-id
+          description: Neutron id of subnet that address belongs to
           required: false
-          type: integer
-          format: int64
+          type: string
     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 +8612,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 +8640,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 +8663,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 created or 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 +8703,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 +8742,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 +8759,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionAvailabilityZonesAvailabilityZoneRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressListRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -7463,19 +8782,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 +8802,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,12 +8818,12 @@ 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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -7515,15 +8834,31 @@ paths:
           description: Cloud-owner defined type indicator (e.g., dcp, lcp)
           required: false
           type: string
+        - name: vlan-id-inner
+          in: query
+          description: Inner VLAN tag
+          required: false
+          type: integer
+          format: int64
+        - name: neutron-network-id
+          in: query
+          description: Neutron network id of the interface that address belongs to
+          required: false
+          type: string
+        - name: neutron-subnet-id
+          in: query
+          description: Neutron id of subnet that address belongs to
+          required: false
+          type: string
     put:
       tags:
         - CloudInfrastructure
-      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 +8881,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 +8909,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 +8932,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 created or 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,63 +8972,23 @@ 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:
-      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: 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}/relationship-list/relationship:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship:
     put:
       tags:
         - CloudInfrastructure
       summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -7716,9 +9011,15 @@ 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: 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/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability.json)
           required: true
           schema:
             $ref: "#/definitions/relationship"
@@ -7727,7 +9028,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -7750,12 +9051,18 @@ 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__
+  /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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressListRelationshipListRelationship
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributesRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -7778,15 +9085,21 @@ 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: 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"
@@ -7795,7 +9108,7 @@ paths:
         - CloudInfrastructure
       summary: delete an existing relationship
       description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressListRelationshipListRelationship
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributesRelationshipListRelationship
       consumes:
         - application/json
         - application/xml
@@ -7818,19 +9131,25 @@ 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}:
+          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 vip-ipv4-address-list
-      description: returns vip-ipv4-address-list
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList
+      summary: returns hpa-feature-attributes
+      description: returns hpa-feature-attributes
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
       produces:
         - application/json
         - application/xml
@@ -7838,7 +9157,7 @@ paths:
         "200":
           description: successful operation
           schema:
-              $ref: "#/getDefinitions/vip-ipv4-address-list"
+              $ref: "#/getDefinitions/hpa-feature-attributes"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -7854,12 +9173,18 @@ 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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -7870,31 +9195,25 @@ paths:
           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
+        - name: hpa-feature
           in: query
-          description: Neutron network id of the interface that address belongs to
+          description: Name of the HPACapability
           required: false
           type: string
-        - name: neutron-subnet-id
+        - name: architecture
           in: query
-          description: Neutron id of subnet that address belongs to
+          description: Hardware architecture
           required: false
           type: string
     put:
       tags:
         - CloudInfrastructure
-      summary: create or update an existing vip-ipv4-address-list
+      summary: create or update an existing hpa-feature-attributes
       description: |
-        Create or update an existing vip-ipv4-address-list.
+        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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv4AddressList
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
       consumes:
         - application/json
         - application/xml
@@ -7917,24 +9236,30 @@ 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: vip-ipv4-address-list 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/vip-ipv4-address-list"
+            $ref: "#/definitions/hpa-feature-attributes"
     patch:
       tags:
         - CloudInfrastructure
-      summary: update an existing vip-ipv4-address-list
+      summary: update an existing hpa-feature-attributes
       description: |
-        Update an existing vip-ipv4-address-list
+        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.
@@ -7945,7 +9270,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: UpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
       consumes:
         - application/json
         - application/xml
@@ -7968,24 +9293,30 @@ 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: vip-ipv4-address-list object that needs to be created or updated. 
+          description: hpa-feature-attributes object that needs to be created or updated. 
           required: true
           schema:
-            $ref: "#/patchDefinitions/vip-ipv4-address-list"
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
     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-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
       consumes:
         - application/json
         - application/xml
@@ -8008,98 +9339,30 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: vip-ipv4-address
-          in: path
-          description: IP address
-          required: true
-          type: string
-          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}/vip-ipv6-address-list/{vip-ipv6-address}/relationship-list/relationship:
-    put:
-      tags:
-        - CloudInfrastructure
-      summary: see node definition for valid relationships
-      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressListRelationshipListRelationship
-      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
+        - name: hpa-capability-id
           in: path
-          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          description: UUID to uniquely identify a HPA capability
           required: true
           type: string
-          example: __CLOUD-OWNER__
-        - name: cloud-region-id
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
           in: path
-          description: Identifier used by the vendor for the region. Second part of composite key
-          required: true
-          type: string
-          example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
-          in: path
-          description: IP address
+          description: name of the specific HPA attribute
           required: true
           type: string
-          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/CloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList.json)
-          required: true
-          schema:
-            $ref: "#/definitions/relationship"
-    delete:
-      tags:
-        - CloudInfrastructure
-      summary: delete an existing relationship
-      description: delete an existing relationship
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressListRelationshipListRelationship
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        "default":
-          description: Response codes found in [response codes](https://wiki.onap.org/).
-      parameters:
-        - name: cloud-owner
-          in: path
-          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
-          required: true
-          type: string
-          example: __CLOUD-OWNER__
-        - name: cloud-region-id
-          in: path
-          description: Identifier used by the vendor for the region. Second part of composite key
-          required: true
-          type: string
-          example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
-          in: path
-          description: IP address
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
           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}:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}:
     get:
       tags:
         - CloudInfrastructure
-      summary: returns vip-ipv6-address-list
-      description: returns vip-ipv6-address-list
-      operationId: getCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
+      summary: returns hpa-capability
+      description: returns hpa-capability
+      operationId: getCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
       produces:
         - application/json
         - application/xml
@@ -8107,7 +9370,7 @@ paths:
         "200":
           description: successful operation
           schema:
-              $ref: "#/getDefinitions/vip-ipv6-address-list"
+              $ref: "#/getDefinitions/hpa-capability"
         "default":
           description: Response codes found in [response codes](https://wiki.onap.org/).
       parameters:
@@ -8123,12 +9386,12 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: hpa-capability-id
           in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
           required: true
           type: string
-          example: __VIP-IPV6-ADDRESS__
+          example: __HPA-CAPABILITY-ID__
         - name: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -8139,31 +9402,25 @@ paths:
           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
+        - name: hpa-feature
           in: query
-          description: Neutron network id of the interface that address belongs to
+          description: Name of the HPACapability
           required: false
           type: string
-        - name: neutron-subnet-id
+        - name: architecture
           in: query
-          description: Neutron id of subnet that address belongs to
+          description: Hardware architecture
           required: false
           type: string
     put:
       tags:
         - CloudInfrastructure
-      summary: create or update an existing vip-ipv6-address-list
+      summary: create or update an existing hpa-capability
       description: |
-        Create or update an existing vip-ipv6-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: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
       consumes:
         - application/json
         - application/xml
@@ -8186,24 +9443,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: hpa-capability-id
           in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
           required: true
           type: string
-          example: __VIP-IPV6-ADDRESS__
+          example: __HPA-CAPABILITY-ID__
         - name: 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: 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-ipv6-address-list"
+            $ref: "#/definitions/hpa-capability"
     patch:
       tags:
         - CloudInfrastructure
-      summary: update an existing vip-ipv6-address-list
+      summary: update an existing hpa-capability
       description: |
-        Update an existing vip-ipv6-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.
@@ -8214,7 +9471,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: UpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
       consumes:
         - application/json
         - application/xml
@@ -8237,24 +9494,24 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: hpa-capability-id
           in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
           required: true
           type: string
-          example: __VIP-IPV6-ADDRESS__
+          example: __HPA-CAPABILITY-ID__
         - name: body
           in: body
-          description: vip-ipv6-address-list object that needs to be created or updated. 
+          description: hpa-capability object that needs to be created or updated. 
           required: true
           schema:
-            $ref: "#/patchDefinitions/vip-ipv6-address-list"
+            $ref: "#/patchDefinitions/hpa-capability"
     delete:
       tags:
         - CloudInfrastructure
-      summary: delete an existing vip-ipv6-address-list
-      description: delete an existing vip-ipv6-address-list
-      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionVipIpv6AddressList
+      summary: delete an existing hpa-capability
+      description: delete an existing hpa-capability
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability
       consumes:
         - application/json
         - application/xml
@@ -8277,17 +9534,57 @@ paths:
           required: true
           type: string
           example: __CLOUD-REGION-ID__
-        - name: vip-ipv6-address
+        - name: hpa-capability-id
           in: path
-          description: IP address
+          description: UUID to uniquely identify a HPA capability
           required: true
           type: string
-          example: __VIP-IPV6-ADDRESS__
+          example: __HPA-CAPABILITY-ID__
         - name: resource-version
           in: query
           description: resource-version for concurrency
           required: true
           type: string
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/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: 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}:
     get:
       tags:
@@ -53549,6 +54846,7 @@ definitions:
       - 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 hpa-capability( hpa-capability 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)
@@ -53559,7 +54857,7 @@ definitions:
       - 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 cannot be deleted if linked to DVS-SWITCH,FLAVOR,HPA-CAPABILITY,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
     required:
@@ -53650,6 +54948,11 @@ definitions:
         type: array
         items:          
           $ref: "#/definitions/vip-ipv6-address-list"
+      hpa-capabilities:
+        type: array
+        items:
+          $ref: "#/definitions/hpa-capability"
+        description: List of cloud-region specific HPA Capabilities
   cloud-regions:
     properties:
       cloud-region:
@@ -54452,8 +55755,9 @@ definitions:
       Openstack flavor.
       ###### Related Nodes
       - TO cloud-region( flavor org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-capability( hpa-capability org.onap.relationships.inventory.BelongsTo flavor, MANY2ONE)
       - FROM vserver( vserver org.onap.relationships.inventory.Uses flavor, MANY2ONE)
-      - FLAVOR cannot be deleted if linked to VSERVER
+      - FLAVOR cannot be deleted if linked to HPA-CAPABILITY,VSERVER
     required:
     - flavor-id
     - flavor-name
@@ -54464,7 +55768,7 @@ definitions:
         description: Flavor id, expected to be unique across cloud-region.
       flavor-name:
         type: string
-        description: Flavor name
+        description: Cloud region Flavor name
       flavor-vcpus:
         type: integer
         format: int32
@@ -54493,6 +55797,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.
@@ -54942,6 +56251,70 @@ 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 org.onap.relationships.inventory.BelongsTo flavor, MANY2ONE)
+      - TO cloud-region( hpa-capability org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-feature-attributes( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+      - HPA-CAPABILITY is DELETED when these are DELETED HPA-FEATURE-ATTRIBUTES
+    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 org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    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.
@@ -59058,6 +60431,7 @@ patchDefinitions:
       - 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 hpa-capability( hpa-capability 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)
@@ -59068,7 +60442,7 @@ patchDefinitions:
       - 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 cannot be deleted if linked to DVS-SWITCH,FLAVOR,HPA-CAPABILITY,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
     required:
@@ -59723,8 +61097,9 @@ patchDefinitions:
       Openstack flavor.
       ###### Related Nodes
       - TO cloud-region( flavor org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-capability( hpa-capability org.onap.relationships.inventory.BelongsTo flavor, MANY2ONE)
       - FROM vserver( vserver org.onap.relationships.inventory.Uses flavor, MANY2ONE)
-      - FLAVOR cannot be deleted if linked to VSERVER
+      - FLAVOR cannot be deleted if linked to HPA-CAPABILITY,VSERVER
     required:
     - flavor-id
     - flavor-name
@@ -59735,7 +61110,7 @@ patchDefinitions:
         description: Flavor id, expected to be unique across cloud-region.
       flavor-name:
         type: string
-        description: Flavor name
+        description: Cloud region Flavor name
       flavor-vcpus:
         type: integer
         format: int32
@@ -59764,6 +61139,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.
@@ -60066,6 +61446,52 @@ 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 org.onap.relationships.inventory.BelongsTo flavor, MANY2ONE)
+      - TO cloud-region( hpa-capability org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-feature-attributes( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+      - HPA-CAPABILITY is DELETED when these are DELETED HPA-FEATURE-ATTRIBUTES
+    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 org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    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.
@@ -63299,6 +64725,7 @@ getDefinitions:
       - 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 hpa-capability( hpa-capability 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)
@@ -63309,7 +64736,7 @@ getDefinitions:
       - 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 cannot be deleted if linked to DVS-SWITCH,FLAVOR,HPA-CAPABILITY,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
     required:
@@ -63400,6 +64827,11 @@ getDefinitions:
         type: array
         items:          
           $ref: "#/getDefinitions/vip-ipv6-address-list"
+      hpa-capabilities:
+        type: array
+        items:
+          $ref: "#/getDefinitions/hpa-capability"
+        description: List of cloud-region specific HPA Capabilities
   cloud-regions:
     properties:
       cloud-region:
@@ -64202,8 +65634,9 @@ getDefinitions:
       Openstack flavor.
       ###### Related Nodes
       - TO cloud-region( flavor org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-capability( hpa-capability org.onap.relationships.inventory.BelongsTo flavor, MANY2ONE)
       - FROM vserver( vserver org.onap.relationships.inventory.Uses flavor, MANY2ONE)
-      - FLAVOR cannot be deleted if linked to VSERVER
+      - FLAVOR cannot be deleted if linked to HPA-CAPABILITY,VSERVER
     required:
     - flavor-id
     - flavor-name
@@ -64214,7 +65647,7 @@ getDefinitions:
         description: Flavor id, expected to be unique across cloud-region.
       flavor-name:
         type: string
-        description: Flavor name
+        description: Cloud region Flavor name
       flavor-vcpus:
         type: integer
         format: int32
@@ -64243,6 +65676,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.
@@ -64692,6 +66130,70 @@ 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 org.onap.relationships.inventory.BelongsTo flavor, MANY2ONE)
+      - TO cloud-region( hpa-capability org.onap.relationships.inventory.BelongsTo cloud-region, MANY2ONE)
+      - FROM hpa-feature-attributes( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+      - HPA-CAPABILITY is DELETED when these are DELETED HPA-FEATURE-ATTRIBUTES
+    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 org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    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.