Merge "AAI-1557 Update sp-partner properties"

diff --combined aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
index 9725b6f,44f9618..a011551
--- 1/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
--- 2/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
@@@ -2211,13 -2211,6 +2211,13 @@@ xmlns:jaxb="http://java.sun.com/xml/ns/
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
 +        <xs:element name="openstack-region-id" type="xs:string" minOccurs="0">
 +          <xs:annotation>\r
 +            <xs:appinfo>\r
 +              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance.")</annox:annotate>\r
 +            </xs:appinfo>\r
 +          </xs:annotation>\r
 +        </xs:element>
          <xs:element name="resource-version" type="xs:string" minOccurs="0">
            <xs:annotation>
              <xs:appinfo>
@@@ -3948,6 -3941,34 +3948,34 @@@
              </xs:appinfo>
            </xs:annotation>
          </xs:element>
+         <xs:element name="operational-status" type="xs:string" minOccurs="0">
+           <xs:annotation>
+             <xs:appinfo>
+               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this sp-partner.")</annox:annotate>
+             </xs:appinfo>
+           </xs:annotation>
+         </xs:element>
+         <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
+           <xs:annotation>
+             <xs:appinfo>
+               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this sp-partner.")</annox:annotate>
+             </xs:appinfo>
+           </xs:annotation>
+         </xs:element>
+         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+           <xs:annotation>
+             <xs:appinfo>
+               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this sp-partner model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+             </xs:appinfo>
+           </xs:annotation>
+         </xs:element>
+         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+           <xs:annotation>
+             <xs:appinfo>
+               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this sp-partner model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+             </xs:appinfo>
+           </xs:annotation>
+         </xs:element>
          <xs:element ref="tns:relationship-list" minOccurs="0"/>
        </xs:sequence>
      </xs:complexType>

diff --combined aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
index 263703b,d42bed5..cfd0672
--- 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,7 -2106,6 +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."/>
@@@ -2125,33 -2119,6 +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."/>
@@@ -7395,6 -7362,33 +7395,33 @@@
                                                <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="operationalStatus" name="operational-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Store the operational-status for this sp-partner." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Store the model-customization-id for this sp-partner." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this sp-partner model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this sp-partner model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+ 
                  <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
              </java-attributes>
              <xml-properties>
@@@ -7538,6 -7532,7 +7565,7 @@@
                                                <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>