Merge "Update the license for 2017-2018 license"

16 files changed, 2948 insertions, 171 deletions

diff --git a/aai-schema/LICENSE.TXT b/aai-schema/LICENSE.TXT
index 72b8cfb7..34558621 100644
--- a/aai-schema/LICENSE.TXT
+++ b/aai-schema/LICENSE.TXT
@@ -1,7 +1,7 @@
 ============LICENSE_START=======================================================
 org.onap.aai
 ================================================================================
-Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
 ================================================================================
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,5 +15,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=========================================================
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index c44464f8..d2702963 100644
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0"?>
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
 <project
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/aai-schema/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java b/aai-schema/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java
index 4fc49edf..7e54b441 100644
--- a/aai-schema/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java
+++ b/aai-schema/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.schema.enums;
 
diff --git a/aai-schema/src/main/java/org/onap/aai/schema/enums/PropertyMetadata.java b/aai-schema/src/main/java/org/onap/aai/schema/enums/PropertyMetadata.java
index 2809b3d4..1e263597 100644
--- a/aai-schema/src/main/java/org/onap/aai/schema/enums/PropertyMetadata.java
+++ b/aai-schema/src/main/java/org/onap/aai/schema/enums/PropertyMetadata.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.schema.enums;
 
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v10.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v10.html
index 0fe66c2d..5247c281 100644
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v10.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v10.html
@@ -158360,8 +158360,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
@@ -158448,11 +158448,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
 
                                 <section class="json-schema-properties">
                                     <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
+                                                 <span class="json-property-required"></span>
                                             </dt>
                                             <dd>
                                                 <p>name of the specific HPA attribute</p>
@@ -158460,8 +158461,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html
index 7f95ad56..e2e7b36b 100644
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html
@@ -171265,8 +171265,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
@@ -171353,11 +171353,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
 
                                 <section class="json-schema-properties">
                                     <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
+                                                 <span class="json-property-required"></span>
                                             </dt>
                                             <dd>
                                                 <p>name of the specific HPA attribute</p>
@@ -171365,8 +171366,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v12.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v12.html
index 056c3248..77ee6f42 100644
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v12.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v12.html
@@ -197,17 +197,32 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--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-get">GET /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</a></td>
+                        <td><a href="#operation--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">GET /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}</a></td>
                         <td><p>returns hpa-feature-attributes</p>
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--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-relationship-list-relationship-put">PUT /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/relationship-list/relationship</a></td>
+                        <td><a href="#operation--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--put">PUT /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}</a></td>
+                        <td><p>create or update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--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--patch">PATCH /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}</a></td>
+                        <td><p>update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--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--delete">DELETE /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}</a></td>
+                        <td><p>delete an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--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">PUT /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</a></td>
                         <td><p>see node definition for valid relationships</p>
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--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-relationship-list-relationship-delete">DELETE /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/relationship-list/relationship</a></td>
+                        <td><a href="#operation--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-delete">DELETE /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</a></td>
                         <td><p>delete an existing relationship</p>
         </td>
                     </tr>
@@ -292,17 +307,32 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</a></td>
+                        <td><a href="#operation--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">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
                         <td><p>returns hpa-feature-attributes</p>
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>create or update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch">PATCH /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>delete an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--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">PUT /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</a></td>
                         <td><p>see node definition for valid relationships</p>
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--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-delete">DELETE /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</a></td>
                         <td><p>delete an existing relationship</p>
         </td>
                     </tr>
@@ -19136,7 +19166,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
-                                                hpa-hw-arch
+                                                architecture
                                             </td>
                                             <td>
                                             	<p>Hardware architecture</p>
@@ -19618,11 +19648,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--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-"></span>
-            <div id="operation--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-get" class="swagger--panel-operation-get panel">
+        <span id="path--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--"></span>
+            <div id="operation--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" class="swagger--panel-operation-get panel">
                 <div class="panel-heading">
                     <div class="operation-summary">returns hpa-feature-attributes</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/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</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/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}</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -19709,6 +19739,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
                                                 cloud-type
                                             </td>
                                             <td>
@@ -19769,7 +19815,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
-                                                hpa-hw-arch
+                                                architecture
                                             </td>
                                             <td>
                                             	<p>Hardware architecture</p>
@@ -19836,11 +19882,474 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--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-relationship-list-relationship-"></span>
-            <div id="operation--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-relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--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--"></span>
+            <div id="operation--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--put" class="swagger--panel-operation-put panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">create or update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/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}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>create or update an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                        			<div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                            	<p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--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--"></span>
+            <div id="operation--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--patch" class="swagger--panel-operation-patch panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/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}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>update an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                        			<div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated.</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                            	<p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--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--"></span>
+            <div id="operation--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--delete" class="swagger--panel-operation-delete panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">delete an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/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}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>delete an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                            	<p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                resource-version
+                                            </td>
+                                            <td>
+                                            	<p>resource-version for concurrency</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--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-"></span>
+            <div id="operation--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" class="swagger--panel-operation-put panel">
                 <div class="panel-heading">
                     <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/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/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/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</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -19942,6 +20451,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     <span class="json-property-required"></span>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                 </tbody>
                             </table>
                         </section>
@@ -19973,11 +20498,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--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-relationship-list-relationship-"></span>
-            <div id="operation--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-relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--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-"></span>
+            <div id="operation--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-delete" class="swagger--panel-operation-delete panel">
                 <div class="panel-heading">
                     <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/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/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/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</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -20067,6 +20592,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     <span class="json-property-required"></span>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                 </tbody>
                             </table>
                         </section>
@@ -21776,7 +22317,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
-                                                hpa-hw-arch
+                                                architecture
                                             </td>
                                             <td>
                                             	<p>Hardware architecture</p>
@@ -22210,11 +22751,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get" class="swagger--panel-operation-get panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--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" class="swagger--panel-operation-get panel">
                 <div class="panel-heading">
                     <div class="operation-summary">returns hpa-feature-attributes</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -22285,6 +22826,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
                                                 cloud-type
                                             </td>
                                             <td>
@@ -22330,7 +22887,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
-                                                hpa-hw-arch
+                                                architecture
                                             </td>
                                             <td>
                                             	<p>Hardware architecture</p>
@@ -22397,11 +22954,426 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put" class="swagger--panel-operation-put panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">create or update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>create or update an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                        			<div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch" class="swagger--panel-operation-patch panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>update an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                        			<div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated.</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete" class="swagger--panel-operation-delete panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">delete an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>delete an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                resource-version
+                                            </td>
+                                            <td>
+                                            	<p>resource-version for concurrency</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--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-"></span>
+            <div id="operation--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" class="swagger--panel-operation-put panel">
                 <div class="panel-heading">
                     <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/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</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -22487,6 +23459,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     <span class="json-property-required"></span>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                 </tbody>
                             </table>
                         </section>
@@ -22518,11 +23506,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--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-"></span>
+            <div id="operation--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-delete" class="swagger--panel-operation-delete panel">
                 <div class="panel-heading">
                     <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/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</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -22596,6 +23584,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     <span class="json-property-required"></span>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                 </tbody>
                             </table>
                         </section>
@@ -177285,8 +178289,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
@@ -177373,11 +178377,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
 
                                 <section class="json-schema-properties">
                                     <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
+                                                 <span class="json-property-required"></span>
                                             </dt>
                                             <dd>
                                                 <p>name of the specific HPA attribute</p>
@@ -177385,8 +178390,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v13.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v13.html
index 0441d6c5..f3a35547 100644
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v13.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v13.html
@@ -197,17 +197,32 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--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-get">GET /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</a></td>
+                        <td><a href="#operation--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">GET /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}</a></td>
                         <td><p>returns hpa-feature-attributes</p>
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--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-relationship-list-relationship-put">PUT /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/relationship-list/relationship</a></td>
+                        <td><a href="#operation--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--put">PUT /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}</a></td>
+                        <td><p>create or update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--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--patch">PATCH /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}</a></td>
+                        <td><p>update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--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--delete">DELETE /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}</a></td>
+                        <td><p>delete an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--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">PUT /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</a></td>
                         <td><p>see node definition for valid relationships</p>
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--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-relationship-list-relationship-delete">DELETE /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/relationship-list/relationship</a></td>
+                        <td><a href="#operation--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-delete">DELETE /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</a></td>
                         <td><p>delete an existing relationship</p>
         </td>
                     </tr>
@@ -292,17 +307,32 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</a></td>
+                        <td><a href="#operation--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">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
                         <td><p>returns hpa-feature-attributes</p>
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>create or update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch">PATCH /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>delete an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--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">PUT /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</a></td>
                         <td><p>see node definition for valid relationships</p>
         </td>
                     </tr>
                     <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--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-delete">DELETE /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</a></td>
                         <td><p>delete an existing relationship</p>
         </td>
                     </tr>
@@ -19136,7 +19166,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
-                                                hpa-hw-arch
+                                                architecture
                                             </td>
                                             <td>
                                             	<p>Hardware architecture</p>
@@ -19618,11 +19648,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--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-"></span>
-            <div id="operation--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-get" class="swagger--panel-operation-get panel">
+        <span id="path--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--"></span>
+            <div id="operation--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" class="swagger--panel-operation-get panel">
                 <div class="panel-heading">
                     <div class="operation-summary">returns hpa-feature-attributes</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/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</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/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}</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -19709,6 +19739,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
                                                 cloud-type
                                             </td>
                                             <td>
@@ -19769,7 +19815,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
-                                                hpa-hw-arch
+                                                architecture
                                             </td>
                                             <td>
                                             	<p>Hardware architecture</p>
@@ -19836,11 +19882,474 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--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-relationship-list-relationship-"></span>
-            <div id="operation--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-relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--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--"></span>
+            <div id="operation--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--put" class="swagger--panel-operation-put panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">create or update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/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}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>create or update an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                        			<div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                            	<p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--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--"></span>
+            <div id="operation--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--patch" class="swagger--panel-operation-patch panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/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}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>update an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                        			<div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated.</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                            	<p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--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--"></span>
+            <div id="operation--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--delete" class="swagger--panel-operation-delete panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">delete an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/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}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>delete an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                            	<p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                resource-version
+                                            </td>
+                                            <td>
+                                            	<p>resource-version for concurrency</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--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-"></span>
+            <div id="operation--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" class="swagger--panel-operation-put panel">
                 <div class="panel-heading">
                     <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/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/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/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</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -19942,6 +20451,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     <span class="json-property-required"></span>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                 </tbody>
                             </table>
                         </section>
@@ -19973,11 +20498,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--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-relationship-list-relationship-"></span>
-            <div id="operation--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-relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--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-"></span>
+            <div id="operation--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-delete" class="swagger--panel-operation-delete panel">
                 <div class="panel-heading">
                     <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/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/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/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</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -20067,6 +20592,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     <span class="json-property-required"></span>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                 </tbody>
                             </table>
                         </section>
@@ -21776,7 +22317,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
-                                                hpa-hw-arch
+                                                architecture
                                             </td>
                                             <td>
                                             	<p>Hardware architecture</p>
@@ -22210,11 +22751,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get" class="swagger--panel-operation-get panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--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" class="swagger--panel-operation-get panel">
                 <div class="panel-heading">
                     <div class="operation-summary">returns hpa-feature-attributes</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -22285,6 +22826,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
                                                 cloud-type
                                             </td>
                                             <td>
@@ -22330,7 +22887,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                         </tr>
                                         <tr>
                                             <td>
-                                                hpa-hw-arch
+                                                architecture
                                             </td>
                                             <td>
                                             	<p>Hardware architecture</p>
@@ -22397,11 +22954,426 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put" class="swagger--panel-operation-put panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">create or update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>create or update an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                        			<div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch" class="swagger--panel-operation-patch panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>update an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                        			<div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated.</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete" class="swagger--panel-operation-delete panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">delete an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>delete an existing hpa-feature-attributes</p>
+            
+                    </section>
+                    	<section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                            	<p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                            	<p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                            	<p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                resource-version
+                                            </td>
+                                            <td>
+                                            	<p>resource-version for concurrency</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--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-"></span>
+            <div id="operation--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" class="swagger--panel-operation-put panel">
                 <div class="panel-heading">
                     <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/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</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -22487,6 +23459,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     <span class="json-property-required"></span>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                 </tbody>
                             </table>
                         </section>
@@ -22518,11 +23506,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                 </div>
             </div>    
         
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--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-"></span>
+            <div id="operation--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-delete" class="swagger--panel-operation-delete panel">
                 <div class="panel-heading">
                     <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/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</strong></h3>
                         Tags:
                             <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                 </div>
@@ -22596,6 +23584,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     <span class="json-property-required"></span>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                            	<p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                            	<span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                 </tbody>
                             </table>
                         </section>
@@ -177285,8 +178289,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
@@ -177373,11 +178377,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
 
                                 <section class="json-schema-properties">
                                     <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
+                                                 <span class="json-property-required"></span>
                                             </dt>
                                             <dd>
                                                 <p>name of the specific HPA attribute</p>
@@ -177385,8 +178390,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v8.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v8.html
index ae582f20..7921d300 100644
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v8.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v8.html
@@ -143165,8 +143165,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
@@ -143253,11 +143253,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
 
                                 <section class="json-schema-properties">
                                     <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
+                                                 <span class="json-property-required"></span>
                                             </dt>
                                             <dd>
                                                 <p>name of the specific HPA attribute</p>
@@ -143265,8 +143266,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v9.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v9.html
index 80444e13..7d20a78a 100644
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v9.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v9.html
@@ -155467,8 +155467,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
@@ -155555,11 +155555,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
 
                                 <section class="json-schema-properties">
                                     <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
+                                                 <span class="json-property-required"></span>
                                             </dt>
                                             <dd>
                                                 <p>name of the specific HPA attribute</p>
@@ -155567,8 +155568,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                 <span class="json-property-type">string</span>
                                                 <span class="json-property-range" title="Value limits"></span>
                                                 
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v10.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v10.yaml
index 98425494..ac8969de 100644
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v10.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v10.yaml
@@ -50036,7 +50036,7 @@ definitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -50055,11 +50055,13 @@ definitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
@@ -54942,7 +54944,7 @@ patchDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
   hpa-feature-attributes:
@@ -54950,11 +54952,13 @@ patchDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
   image:
@@ -59345,7 +59349,7 @@ getDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -59364,11 +59368,13 @@ getDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml
index 7b6536a6..10d06268 100644
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml
@@ -54066,7 +54066,7 @@ definitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -54085,11 +54085,13 @@ definitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
@@ -59200,7 +59202,7 @@ patchDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
   hpa-feature-attributes:
@@ -59208,11 +59210,13 @@ patchDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
   image:
@@ -63815,7 +63819,7 @@ getDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -63834,11 +63838,13 @@ getDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
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 db6978d7..130578d4 100644
--- 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
@@ -5362,7 +5362,7 @@ paths:
           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/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}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship:
     put:
       tags:
         - CloudInfrastructure
@@ -5402,6 +5402,12 @@ paths:
           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/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
@@ -5448,7 +5454,13 @@ paths:
           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:
+        - 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
@@ -5490,6 +5502,12 @@ paths:
           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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -5510,11 +5528,180 @@ paths:
           description: Name of the HPACapability
           required: false
           type: string
-        - name: hpa-hw-arch
+        - name: architecture
           in: query
           description: Hardware architecture
           required: false
           type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing hpa-feature-attributes
+      description: |
+        Create or update an existing hpa-feature-attributes.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      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: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing hpa-feature-attributes
+      description: |
+        Update an existing hpa-feature-attributes
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      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: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. 
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing hpa-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      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: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: 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:
@@ -5577,7 +5764,7 @@ paths:
           description: Name of the HPACapability
           required: false
           type: string
-        - name: hpa-hw-arch
+        - name: architecture
           in: query
           description: Hardware architecture
           required: false
@@ -8870,7 +9057,7 @@ paths:
           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/relationship-list/relationship:
+  /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
@@ -8904,6 +9091,12 @@ paths:
           required: true
           type: string
           example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
         - name: body
           in: body
           description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
@@ -8944,7 +9137,13 @@ paths:
           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:
+        - 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
@@ -8980,6 +9179,12 @@ paths:
           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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -8995,11 +9200,162 @@ paths:
           description: Name of the HPACapability
           required: false
           type: string
-        - name: hpa-hw-arch
+        - name: architecture
           in: query
           description: Hardware architecture
           required: false
           type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing hpa-feature-attributes
+      description: |
+        Create or update an existing hpa-feature-attributes.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing hpa-feature-attributes
+      description: |
+        Update an existing hpa-feature-attributes
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. 
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing hpa-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}:
     get:
       tags:
@@ -9051,7 +9407,7 @@ paths:
           description: Name of the HPACapability
           required: false
           type: string
-        - name: hpa-hw-arch
+        - name: architecture
           in: query
           description: Hardware architecture
           required: false
@@ -55924,7 +56280,7 @@ definitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -55943,11 +56299,13 @@ definitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
@@ -61117,7 +61475,7 @@ patchDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
   hpa-feature-attributes:
@@ -61125,11 +61483,13 @@ patchDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
   image:
@@ -65799,7 +66159,7 @@ getDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -65818,11 +66178,13 @@ getDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v13.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v13.yaml
index 08e7daf6..976f1aa9 100644
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v13.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v13.yaml
@@ -5362,7 +5362,7 @@ paths:
           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/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}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship:
     put:
       tags:
         - CloudInfrastructure
@@ -5402,6 +5402,12 @@ paths:
           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/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
@@ -5448,7 +5454,13 @@ paths:
           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:
+        - 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
@@ -5490,6 +5502,12 @@ paths:
           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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -5510,11 +5528,180 @@ paths:
           description: Name of the HPACapability
           required: false
           type: string
-        - name: hpa-hw-arch
+        - name: architecture
           in: query
           description: Hardware architecture
           required: false
           type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing hpa-feature-attributes
+      description: |
+        Create or update an existing hpa-feature-attributes.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      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: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing hpa-feature-attributes
+      description: |
+        Update an existing hpa-feature-attributes
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      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: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. 
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing hpa-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      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: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: 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:
@@ -5577,7 +5764,7 @@ paths:
           description: Name of the HPACapability
           required: false
           type: string
-        - name: hpa-hw-arch
+        - name: architecture
           in: query
           description: Hardware architecture
           required: false
@@ -8870,7 +9057,7 @@ paths:
           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/relationship-list/relationship:
+  /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
@@ -8904,6 +9091,12 @@ paths:
           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/v13/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
@@ -8944,7 +9137,13 @@ paths:
           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:
+        - 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
@@ -8980,6 +9179,12 @@ paths:
           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: cloud-type
           in: query
           description: Type of the cloud (e.g., openstack)
@@ -8995,11 +9200,162 @@ paths:
           description: Name of the HPACapability
           required: false
           type: string
-        - name: hpa-hw-arch
+        - name: architecture
           in: query
           description: Hardware architecture
           required: false
           type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing hpa-feature-attributes
+      description: |
+        Create or update an existing hpa-feature-attributes.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing hpa-feature-attributes
+      description: |
+        Update an existing hpa-feature-attributes
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. 
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing hpa-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
   /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}:
     get:
       tags:
@@ -9051,7 +9407,7 @@ paths:
           description: Name of the HPACapability
           required: false
           type: string
-        - name: hpa-hw-arch
+        - name: architecture
           in: query
           description: Hardware architecture
           required: false
@@ -55924,7 +56280,7 @@ definitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -55943,11 +56299,13 @@ definitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
@@ -61117,7 +61475,7 @@ patchDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
   hpa-feature-attributes:
@@ -61125,11 +61483,13 @@ patchDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
   image:
@@ -65799,7 +66159,7 @@ getDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -65818,11 +66178,13 @@ getDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v8.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v8.yaml
index eaf4d791..991c39b8 100644
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v8.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v8.yaml
@@ -45146,7 +45146,7 @@ definitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -45165,11 +45165,13 @@ definitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
@@ -49866,7 +49868,7 @@ patchDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
   hpa-feature-attributes:
@@ -49874,11 +49876,13 @@ patchDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
   image:
@@ -54115,7 +54119,7 @@ getDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -54134,11 +54138,13 @@ getDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v9.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v9.yaml
index 61d8af69..1fc4e0da 100644
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v9.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v9.yaml
@@ -49103,7 +49103,7 @@ definitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -49122,11 +49122,13 @@ definitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version:
@@ -53973,7 +53975,7 @@ patchDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
   hpa-feature-attributes:
@@ -53981,11 +53983,13 @@ patchDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
   image:
@@ -58323,7 +58327,7 @@ getDefinitions:
       hpa-version:
         type: string
         description: HPA schema version
-      hpa-hw-arch:
+      architecture:
         type: string
         description: Hardware architecture
       resource-version:
@@ -58342,11 +58346,13 @@ getDefinitions:
       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-attr-key:
+      hpa-attribute-key:
         type: string
         description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
         type: string
         description: JSON string specifying the value, unit and type of the specific HPA attribute
       resource-version: