Update v21 for following schema changes:

Add hardware catalog and add props for profile
Add port list selector list vlan characteristics
Fix the vlan tags and vlan ranges
Add the v21 db edge rules for physical inventory

Issue-ID: AAI-3128
Change-Id: I295517c9e3c0830a17d4f09ffcd49501fcfd2966
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

1 files changed, 59 insertions, 6 deletions

diff --git a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
index 122f8f9..8ea9912 100644
--- a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
@@ -737,6 +737,7 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v16.VipIpv4AddressList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v16.VipIpv6AddressList"/>
+				<xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v16.VlanRanges"/>
 				<xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v16.HpaCapabilities">
 					<xml-properties>
 						<xml-property name="description" value="List of cloud-region specific HPA Capabilities"/>
@@ -3286,7 +3287,6 @@
                 <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v16.Configurations"/>
                 <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v16.ForwardingPaths"/>
                 <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v16.Collections"/>
-                <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v16.VlanTags"/>
 				<xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v16.Connectivities"/>
 				<xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v16.LanPortConfigs"/>
 				<xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v16.NetworkResources"/>
@@ -7558,13 +7558,66 @@
             </xml-properties>
         </java-type>
 
+        <java-type name="VlanRanges">
+            <xml-root-element name="vlan-ranges"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v16.VlanRange"/>
+            </java-attributes>
+            <xml-properties>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VlanRange">
+            <xml-root-element name="vlan-range"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="vlan id in range UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="vlan id in range lower"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="vlan id in range upper"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vlan type"/>
+                    </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="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v16.VlanTags"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of vlan range"/>
+                <xml-property name="indexedProps" value="vlan-range-id,vlan-type"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="vlan-ranges"/>
+                <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/>
+                <xml-property name="searchable" value="vlan-range-id"/>
+                <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/>
+            </xml-properties>
+        </java-type>
+
         <java-type name="VlanTags">
+            <xml-properties>
+                <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/>
+            </xml-properties>
             <xml-root-element name="vlan-tags"/>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v16.VlanTag"/>
             </java-attributes>
         </java-type>
-
         <java-type name="VlanTag">
             <xml-root-element name="vlan-tag"/>
             <java-attributes>
@@ -7583,7 +7636,7 @@
                         <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long">
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
                         <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
@@ -7593,12 +7646,12 @@
                         <xml-property name="description" value="is private flag."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String">
+				<xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="VLAN tag Type"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String">
+				<xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="VLAN Tag Function"/>
                     </xml-properties>
@@ -7619,7 +7672,7 @@
                 <xml-property name="description" value="vlan tag information"/>
                 <xml-property name="container" value="vlan-tags"/>
                 <xml-property name="dependentOn" value="vlan-range"/>
-                <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/>
+                <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/>
                 <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/>
             </xml-properties>
         </java-type>