Add support for vlan range and vlan tag
[aai/schema-service.git] / aai-schema / src / main / resources / onap / oxm / v16 / aai_oxm_v16.xml
index 736a5f6..122f8f9 100644 (file)
@@ -1,23 +1,24 @@
 <!--
-  ============LICENSE_START=======================================================
-  org.onap.aai
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  Copyright (C) 2018 Huawei Technologies (Australia) Pty Ltd. 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=========================================================
-  --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v16" xml-mapping-metadata-complete="true">
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+    Copyright (C) 2018 Huawei Technologies (Australia) Pty Ltd. 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=========================================================
+-->
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v16" xml-mapping-metadata-complete="true">
        <xml-schema element-form-default="QUALIFIED">
                <xml-ns namespace-uri="http://org.onap.aai.inventory/v16"/>
        </xml-schema>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
-                               <xml-property name="indexedProps" value="sdnc-id"/>
-                               <xml-property name="searchable" value="sdnc-id"/>
                                <xml-property name="container" value="esr-thirdparty-sdnc-list"/>
                                <xml-property name="namespace" value="external-system"/>
                        <xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
 
                <java-type name="EsrSystemInfoList">
                        <xml-root-element name="esr-system-info-list"/>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of persistent block-level external system auth info."/>
-                       </xml-properties>
+                       
                        <java-attributes>
                                <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v16.EsrSystemInfo"/>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="maximumDepth" value="0"/>
-                       </xml-properties>
+                              <xml-property name="description" value="Collection of persistent block-level external system auth info."/>
+                      </xml-properties>
                </java-type>
 
                <java-type name="EsrSystemInfo">
                 </xml-element>
                 <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
             </java-attributes>
         </java-type>
         <java-type name="Complexes">
-            <xml-properties>
-                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
-            </xml-properties>
+            
             <xml-root-element name="complexes"/>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v16.Complex"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
+               <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+           </xml-properties>
         </java-type>
 
         <java-type name="Complex">
         </java-type>
 
         <java-type name="Tenants">
-            <xml-properties>
-                <xml-property name="description" value="Collection of openstack tenants."/>
-            </xml-properties>
+            
             <xml-root-element name="tenants"/>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v16.Tenant"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
+               <xml-property name="description" value="Collection of openstack tenants."/>
+           </xml-properties>
         </java-type>
 
         <java-type name="Tenant">
         </java-type>
 
         <java-type name="Pservers">
-            <xml-properties>
-                <xml-property name="description" value="Collection of compute hosts."/>
-            </xml-properties>
+            
             <xml-root-element name="pservers"/>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v16.Pserver"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
+               <xml-property name="description" value="Collection of compute hosts."/>
+           </xml-properties>
         </java-type>
 
         <java-type name="Pserver">
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Physical interface (e.g., nic)"/>
-                               <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status"/>
+                               <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status"/>
                 <xml-property name="nameProps" value="prov-status"/>
                 <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
                 <xml-property name="container" value="p-interfaces"/>
                 </xml-element>
                 <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ONAP Yang models."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
         </java-type>
 
         <java-type name="Customers">
-            <xml-properties>
-                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
-            </xml-properties>
+            
             <xml-root-element name="customers"/>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v16.Customer"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
+               <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
+           </xml-properties>
         </java-type>
 
         <java-type name="Customer">
             <java-attributes>
                 <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer."/>
+                        <xml-property name="description" value="Global customer id used across ONAP to uniquely identify customer."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
             <java-attributes>
                 <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP."/>
+                        <xml-property name="description" value="Value defined by orchestration to identify this service across ONAP."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
                 </xml-element>
                 <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
             <xml-properties>
                 <xml-property name="description" value="VPN binding"/>
                 <xml-property name="nameProps" value="vpn-name,vpn-type"/>
-                               <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status"/>
+                               <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status,model-invariant-id,model-version-id"/>
                 <xml-property name="searchable" value="vpn-id,vpn-name"/>
                 <xml-property name="uniqueProps" value="vpn-id"/>
                 <xml-property name="container" value="vpn-bindings"/>
                 </xml-element>
                 <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
             <xml-properties>
                 <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
                 <xml-property name="nameProps" value="vnf-name"/>
-                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
                 <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
                 <xml-property name="uniqueProps" value="vnf-id"/>
                 <xml-property name="container" value="vces"/>
             <xml-properties>
                 <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
                 <xml-property name="nameProps" value="port-group-name"/>
-                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/>
                 <xml-property name="dependentOn" value="vce"/>
                 <xml-property name="container" value="port-groups"/>
                 <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
             <xml-properties>
                 <xml-property name="description" value="Generic network definition"/>
                 <xml-property name="nameProps" value="network-name"/>
-                <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+                <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
                 <xml-property name="searchable" value="network-id,network-name"/>
                 <xml-property name="uniqueProps" value="network-id"/>
                 <xml-property name="container" value="l3-networks"/>
         </java-type>
 
         <java-type name="GenericVnfs">
-            <xml-properties>
-                <xml-property name="description" value="Collection of VNFs"/>
-            </xml-properties>
+            
             <xml-root-element name="generic-vnfs"/>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v16.GenericVnf"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
+               <xml-property name="description" value="Collection of VNFs"/>
+           </xml-properties>
         </java-type>
 
         <java-type name="GenericVnf">
                 </xml-element>
                 <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="identifier of managed by ATT or customer"/>
+                        <xml-property name="description" value="identifier of managed customer"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
         </java-type>
 
         <java-type name="Pnfs">
-            <xml-properties>
-                <xml-property name="description" value="Collection of Physical Network Functions."/>
-            </xml-properties>
+            
             <xml-root-element name="pnfs"/>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v16.Pnf"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
+               <xml-property name="description" value="Collection of Physical Network Functions."/>
+           </xml-properties>
         </java-type>
 
         <java-type name="Pnf">
                 </xml-element>
                 <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="identifier of managed by ATT or customer"/>
+                        <xml-property name="description" value="identifier of managed customer"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Software Version"/>
-                <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/>
+                <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/>
                 <xml-property name="dependentOn" value="pnf"/>
                 <xml-property name="container" value="pnf"/>
             <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
         </java-type>
 
         <java-type name="PhysicalLinks">
-            <xml-properties>
-                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
-            </xml-properties>
+            
             <xml-root-element name="physical-links"/>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v16.PhysicalLink"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
+               <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+           </xml-properties>
         </java-type>
 
         <java-type name="PhysicalLink">
                 </xml-element>
                 <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer"/>
+                        <xml-property name="description" value="Shared DMZ or a DMZ specific to a customer"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
                 </xml-element>
                 <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
+                        <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,&#xC2;&#xA0;aes-192-cbc, aes-265-cbc"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
                 </xml-element>
                 <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
+                        <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,&#xC2;&#xA0;aes-192-cbc, aes-265-cbc"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
                <java-type name="ReservedPropNames">
                        <xml-properties>
                                <xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
-                               <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
-                               <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
+                               <xml-property name="uniqueProps" value="aai-unique-key,aai-uri"/>
+                               <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
                        </xml-properties>
                        <xml-root-element name="reserved-prop-names"/>
                        <java-attributes>
                 <xml-property name="nameProps" value="description,instance-group-name"/>
                 <xml-property name="uniqueProps" value="id"/>
                 <xml-property name="searchable" value="id,description"/>
-                <xml-property name="indexedProps" value="id,type,sub-type,model-invariant-id,model-version-id"/>
+                <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/>
                 <xml-property name="container" value="instance-groups"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
                 </xml-element>
                 <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Design of zone [Medium/Large]"/>
+                        <xml-property name="description" value="Design of zone [Medium/Large&#x2026;]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
+                </xml-element>
+                 <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not zone object is in maintenance mode."/>
+                    </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/>
             </java-attributes>
                 <xml-property name="container" value="zones"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
-            <xml-property name="requiredProps" value="zone-id,zone-name,design-type,zone-context"/>
+            <xml-property name="requiredProps" value="zone-id,zone-name,design-type,zone-context,in-maint"/>
             </xml-properties>
         </java-type>
         <java-type name="RouteTargets">
         </java-type>
 
         <java-type name="OperationalEnvironments">
-            <xml-properties>
-                <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
-            </xml-properties>
+            
             <xml-root-element name="operational-environments"/>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v16.OperationalEnvironment"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
+               <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
+           </xml-properties>
         </java-type>
 
         <java-type name="OperationalEnvironment">
                     <xml-properties>
                         <xml-property name="description" value="tagMode for network side of EVC"/>
                     </xml-properties>
+                </xml-element>
+                 <xml-element java-attribute="productEntryId" name="product-entry-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Product ID"/>
+                    </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
             <java-attributes>
                 <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of the vlan-tag"/>
+                        <xml-property name="description" value="Vlan Tag Id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="purpose (l3-network to be connected to)"/>
+                        <xml-property name="description" value="Role assigned to this vlan-tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Integer">
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="VLAN inner id"/>
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Integer">
+                <xml-element java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="VLAN outer id"/>
+                        <xml-property name="description" value="is private flag."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="is VLAN private?"/>
+                        <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-properties>
+                        <xml-property name="description" value="VLAN Tag Function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The config-phase associated with this vlan-tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="namespace" value="network"/>
+                <xml-property name="description" value="vlan tag information"/>
                 <xml-property name="container" value="vlan-tags"/>
-                <xml-property name="uniqueProps" value="vlan-tag-id"/>
+                <xml-property name="dependentOn" value="vlan-range"/>
                 <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/>
+                <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/>
             </xml-properties>
         </java-type>
 
         <java-type name="NetworkTechnologies">
-            <xml-properties>
-                <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/>
-            </xml-properties>
+            
             <xml-root-element name="network-technologies"/>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v16.NetworkTechnology"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
+               <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/>
+           </xml-properties>
         </java-type>
 
         <java-type name="NetworkTechnology">
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Instance of an sp-partner"/>
-                <xml-property name="indexedProps" value="sp-partner-id,url,callsource"/>
+                <xml-property name="indexedProps" value="sp-partner-id,url,callsource,model-invariant-id,model-version-id"/>
                 <xml-property name="nameProps" value="sp-partner-id"/>
                 <xml-property name="searchable" value="sp-partner-id"/>
                 <xml-property name="uniqueProps" value="sp-partner-id"/>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Instance of a connectivity"/>
-                               <xml-property name="indexedProps" value="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status"/>
+                               <xml-property name="indexedProps" value="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status,model-invariant-id,model-version-id"/>
                                <xml-property name="nameProps" value="etht-svc-name"/>
                                <xml-property name="searchable" value="connectivity-id"/>
                                <xml-property name="uniqueProps" value="connectivity-id"/>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Instance of a site-resource"/>
-                               <xml-property name="indexedProps" value="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status"/>
+                               <xml-property name="indexedProps" value="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status,model-invariant-id,model-version-id"/>
                                <xml-property name="nameProps" value="site-resource-name"/>
                                <xml-property name="searchable" value="site-resource-id"/>
                                <xml-property name="uniqueProps" value="site-resource-id"/>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Instance of an sdwan-vpn"/>
-                               <xml-property name="indexedProps" value="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status"/>
+                               <xml-property name="indexedProps" value="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status,model-invariant-id,model-version-id"/>
                                <xml-property name="nameProps" value="sdwan-vpn-name"/>
                                <xml-property name="searchable" value="sdwan-vpn-id"/>
                                <xml-property name="uniqueProps" value="sdwan-vpn-id"/>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Instance of a device"/>
-                               <xml-property name="indexedProps" value="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status"/>
+                               <xml-property name="indexedProps" value="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status,model-invariant-id,model-version-id"/>
                                <xml-property name="nameProps" value="device-name"/>
                                <xml-property name="searchable" value="device-id"/>
                                <xml-property name="uniqueProps" value="device-id"/>
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Instance of a wan-port-config"/>
-                               <xml-property name="indexedProps" value="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status"/>
+                               <xml-property name="indexedProps" value="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status,model-invariant-id,model-version-id"/>
                                <xml-property name="nameProps" value="wan-port-config-name"/>
                                <xml-property name="searchable" value="wan-port-config-id"/>
                                <xml-property name="uniqueProps" value="wan-port-config-id"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="aggregateRoute" name="aggregate-route" type="inventory.aai.onap.org.v16.AggregateRoute"/>
             </java-attributes>
         </java-type>   
-        
+
         <java-type name="AggregateRoute">
             <xml-root-element name="aggregate-route"/>
             <java-attributes>
-                <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="aggRouteId" name="agg-route-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
                         <xml-property name="description" value="Unique id of the aggregate-route instance"/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="networkStartAddress" name="network-start-address" required="true" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Name of the forwarding-path"/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="cidrMask" name="cidr-mask" required="true" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="CIDR-mask for aggregate route subnet"/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="ipVersion" name="ip-version" required="true" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies is aggregate route is ipv4 or ipv6"/>
                     </xml-properties>
-                </xml-element>                
+                </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.v16.RelationshipList"/>                   
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services.  In 1902, SDNC will create aggregate-route objects and write them to A&amp;AI. "/>
-                <xml-property name="uniqueProps" value="route-id"/>
-                <xml-property name="container" value="aggregate-routes"/> 
+                <xml-property name="uniqueProps" value="agg-route-id"/>
+                <xml-property name="container" value="aggregate-routes"/>
                 <xml-property name="dependentOn" value="l3-network"/>
-                <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{route-id}"/>
-            <xml-property name="requiredProps" value="route-id,network-start-address,cidr-mask,ip-version"/>
+                <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/>
+            <xml-property name="requiredProps" value="agg-route-id,network-start-address,cidr-mask,ip-version"/>
             </xml-properties>
                </java-type>