Merge "HPA Telemetry Schema"

diff --combined aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
index 69bea33,0996468..263703b
--- 1/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
--- 2/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
@@@ -475,11 -475,6 +475,11 @@@
                                                 <xml-property name="description" value="the status of external system." />
                                         </xml-properties>
                                 </xml-element>
 +                               <xml-element java-attribute="openstackRegionId" name="openstack-region-id" type="java.lang.String">
 +                                       <xml-properties>
 +                                                 <xml-property name="description" value="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance." />
 +                                       </xml-properties>
 +                               </xml-element>
                                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                         <xml-properties>
                                                 <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
@@@ -2111,6 -2106,7 +2111,7 @@@
                  <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
                  <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v14.PInterfaces"/>
                  <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces"/>
+                 <xml-element container-type="java.util.ArrayList" java-attribute="hpaCapacity" name="hpa-capacity" type="inventory.aai.onap.org.v14.HpaCapacity"/>
              </java-attributes>
              <xml-properties>
                  <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
@@@ -2124,6 -2120,33 +2125,33 @@@
              </xml-properties>
          </java-type>
  
+         <java-type name="HpaCapacity">
+             <xml-root-element name="hpa-capacity"/>
+             <java-attributes>
+                 <xml-element java-attribute="hpaCapacityKey" name="hpa-capacity-key" required="true" type="java.lang.String" xml-key="true">
+                     <xml-properties>
+                         <xml-property name="description" value="Composite key formed with hpaFeature and append list of hpaFeatureAttributes needed for capacity check"/>
+                     </xml-properties>
+                 </xml-element>
+                 <xml-element java-attribute="hpaCapacityValue" name="hpa-capacity-value" type="java.lang.String">
+                     <xml-properties>
+                         <xml-property name="description" value="JSON string specifying the capacity (total,free), unit and metadata of the specific HPA attribute"/>
+                     </xml-properties>
+                 </xml-element>
+                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                     <xml-properties>
+                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                     </xml-properties>
+                 </xml-element>
+                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+             </java-attributes>
+             <xml-properties>
+                 <xml-property name="description" value="HPA Capacity information for compute node"/>
+                 <xml-property name="indexedProps" value="hpa-capacity-key"/>
+                 <xml-property name="dependentOn" value="hpa-capacity"/>
+             </xml-properties>
+         </java-type>
+ 
          <java-type name="PInterfaces">
              <xml-properties>
                  <xml-property name="description" value="Collection of physical interfaces."/>