Merge "added new aai-schema-ingest library"

[aai/aai-common.git] / aai-schema / src / main / resources / oxm / aai_oxm_v12.xml

diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
index 196d00f..b8fad43 100644 (file)
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   ============LICENSE_START=======================================================
-  org.openecomp.aai
+  org.onap.aai
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -513,12 +513,12 @@
                                                <xml-property name="description" value="Name of the HPACapability"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="version" name="hpa-version" type="java.lang.String">
+                               <xml-element java-attribute="hpaVersion" name="hpa-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="HPA schema version"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="hardwareArchitecture" name="hpa-hw-arch" type="java.lang.String">
+                               <xml-element java-attribute="architecture" name="architecture" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Hardware architecture"/>
                                        </xml-properties>
@@ -529,25 +529,25 @@
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttribute" name="hpa-feature-attribute" type="inventory.aai.onap.org.v12.HpaFeatureAttribute"/>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttributes" name="hpa-feature-attributes" type="inventory.aai.onap.org.v12.HpaFeatureAttributes"/>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Represents a HPA capability"/>
-                               <xml-property name="indexedProps" value="hpa-feature,hpa-hw-arch,hpa-capability-id"/>
-                               <xml-property name="dependentOn" value="flavor"/>
+                               <xml-property name="indexedProps" value="hpa-feature,architecture,hpa-capability-id"/>
+                               <xml-property name="dependentOn" value="flavor,cloud-region"/>
                                <xml-property name="container" value="hpa-capabilities"/>
                        </xml-properties>
                </java-type>
 
-               <java-type name="HpaFeatureAttribute">
-                       <xml-root-element name="hpa-feature-attribute"/>
+               <java-type name="HpaFeatureAttributes">
+                       <xml-root-element name="hpa-feature-attributes"/>
                        <java-attributes>
-                               <xml-element java-attribute="hpaAttributeKey" name="hpa-attr-key" type="java.lang.String">
+                               <xml-element java-attribute="hpaAttributeKey" name="hpa-attribute-key" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
                                                <xml-property name="description" value="name of the specific HPA attribute"/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="hpaAttributeValue" name="hpa-attr-value" type="java.lang.String">
+                               <xml-element java-attribute="hpaAttributeValue" name="hpa-attribute-value" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="JSON string specifying the value, unit and type of the specific HPA attribute"/>
                                        </xml-properties>
@@ -561,6 +561,8 @@
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="HPA Capability Feature attributes"/>
+                               <xml-property name="indexedProps" value="hpa-attribute-key"/>
+                               <xml-property name="dependentOn" value="hpa-capability"/>
                                <xml-property name="container" value="hpa-capability"/>
                        </xml-properties>
                </java-type>