Sync the latest code changes
[aai/aai-common.git] / aai-core / src / test / resources / bundleconfig-local / etc / oxm / aai_oxm_v2.xml
diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v2.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v2.xml
deleted file mode 100644 (file)
index eba7c4b..0000000
+++ /dev/null
@@ -1,1729 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2017 AT&T Intellectual Property. 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=========================================================
-
-    ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
--->
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org" xml-mapping-metadata-complete="true">
-       <xml-schema element-form-default="QUALIFIED">
-               <xml-ns namespace-uri="http://org.openecomp.aai.inventory" />
-       </xml-schema>
-       <java-types>
-               <java-type name="Inventory">
-                       <xml-root-element name="inventory" />
-                       <java-attributes>
-                               <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.Search" />
-                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.Actions" />
-                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.CloudInfrastructure" />
-                               <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.Business" />
-                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.ServiceDesignAndCreation" />
-                               <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.Network" />
-                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.AaiInternal" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Search">
-                       <xml-root-element name="search" />
-                       <java-attributes>
-                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.SearchResults" />
-                               <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.SdnZoneResponse" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="SearchResults">
-                       <xml-root-element name="search-results" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.ResultData" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ResultData">
-                       <xml-root-element name="result-data" />
-                       <java-attributes>
-                               <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The specific type of node in the A&amp;AI graph" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The URL to the specific resource" />
-                                       </xml-properties>
-                               </xml-element>
-                       </java-attributes>
-               </java-type>
-               <java-type name="SdnZoneResponse">
-                       <xml-root-element name="sdn-zone-response" />
-                       <java-attributes>
-                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.OamNetworks" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.AzAndDvsSwitches" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="AzAndDvsSwitches">
-                       <xml-root-element name="az-and-dvs-switches" />
-                       <java-attributes>
-                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.DvsSwitches" />
-                               <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.AvailabilityZone" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Actions">
-                       <xml-properties>
-                               <xml-property name="description" value="Ignore the RESTCONF paths for this. It will be aai/{version}/actions/update only." />
-                       </xml-properties>
-                       <xml-root-element name="actions" />
-                       <java-attributes>
-                               <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.Update" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Update">
-                       <xml-root-element name="update" />
-                       <java-attributes>
-                               <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.Action" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.UpdateNodeKey" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Action">
-                       <xml-root-element name="action" />
-                       <java-attributes>
-                               <xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.ActionData" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ActionData">
-                       <xml-root-element name="action-data" />
-                       <java-attributes>
-                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="UpdateNodeKey">
-                       <xml-root-element name="update-node-key" />
-                       <java-attributes>
-                               <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
-                               <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="CloudInfrastructure">
-                       <xml-root-element name="cloud-infrastructure" />
-                       <java-attributes>
-                               <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.Complexes" />
-                               <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.Tenants" />
-                               <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.Flavors" />
-                               <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.Images" />
-                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.DvsSwitches" />
-                               <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.Pservers" />
-                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.OamNetworks" />
-                               <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.AvailabilityZones" />
-                               <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.VirtualDataCenters" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Complexes">
-                       <xml-properties>
-                               <xml-property name="description" value="Complex housing an LCP instance. In 1504, this data comes from RCT in a file processed on a schedule defined in crontab. A&amp;AI has code to parse the file and take action on the graph using our REST APIs." />
-                       </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.Complex" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Complex">
-                       <xml-root-element name="complex" />
-                       <java-attributes>
-                               <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Data center code which can be an alternate way to identify a complex" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Gamma complex name for LCP instance." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Type, e.g., central office, data center." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-                               <xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="state" name="state" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="region" name="region" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="latitude" name="latitude" type="java.lang.String" />
-                               <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
-                               <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
-                               <xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-                               <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.CtagPools" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="indexedProps" value="data-center-code,complex-name,physical-location-id" />
-                               <xml-property name="uniqueProps" value="physical-location-id" />
-                               <xml-property name="container" value="complexes" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="RelationshipList">
-                       <xml-root-element name="relationship-list" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.Relationship" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Relationship">
-                       <xml-root-element name="relationship" />
-                       <java-attributes>
-                               <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="URL to the object in A&amp;AI." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.RelationshipData" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="RelationshipData">
-                       <xml-root-element name="relationship-data" />
-                       <java-attributes>
-                               <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Value of the attribute." />
-                                       </xml-properties>
-                               </xml-element>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="CtagPools">
-                       <xml-root-element name="ctag-pools" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.CtagPool" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="CtagPool">
-                       <xml-root-element name="ctag-pool" />
-                       <java-attributes>
-                               <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The Target provider edge router" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Name of the availability zone" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Comma separated list of ctags" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="indexedProps" value="availability-zone-name" />
-                               <xml-property name="dependentOn" value="complex" />
-                               <xml-property name="container" value="ctag-pools" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Tenants">
-                       <xml-properties>
-                               <xml-property name="description" value="OpenStack tenant. In 1504, RO will PUT the tenant to A&amp;AI. Relationship list is used to link to service-subscription." />
-                       </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.Tenant" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Tenant">
-                       <xml-root-element name="tenant" />
-                       <java-attributes>
-                               <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique id relative to the platform, assuming unique across AT&amp;T for now" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Readable name of tenant" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.Vservers" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Relationship-list must include related to of service-subscription and keys for global-customer-id and service-type." />
-                               <xml-property name="nameProps" value="tenant-name" />
-                               <xml-property name="indexedProps" value="tenant-id" />
-                               <xml-property name="uniqueProps" value="tenant-id" />
-                               <xml-property name="container" value="tenants" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Vservers">
-                       <xml-properties>
-                               <xml-property name="description" value="Virtual Server, with its ipaddresses and block storage volumes. In 1504, this REST interface is unused. Instead, the hand coded vserver REST API from Trinity was modified to take the relationship list structure. In 1507, we hope to negotiate with RO to change to use our Yang-driven vserver, image, flavor, etc. Relationship list is used to link to VNF (vce and generic-vnf, etc.)." />
-                       </xml-properties>
-                       <xml-root-element name="vservers" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.Vserver" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Vserver">
-                       <xml-root-element name="vserver" />
-                       <java-attributes>
-                               <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique identifier for this vserver relative to its tenant" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Name of vserver" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Alternative name of vserver" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
-                                               <xml-property name="readOnly" value="legacy-v2" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="URL that points to source of truth for this resource" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.Volumes" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.LInterfaces" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="nameProps" value="vserver-name" />
-                               <xml-property name="indexedProps" value="vserver-name,vserver-id,vserver-name2" />
-                               <xml-property name="uniqueProps" value="vserver-id" />
-                               <xml-property name="dependentOn" value="tenant" />
-                               <xml-property name="container" value="vservers" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="LInterfaces">
-                       <xml-root-element name="l-interfaces" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.LInterface" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="LInterface">
-                       <xml-root-element name="l-interface" />
-                       <java-attributes>
-                               <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true" />
-                               <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String" />
-                               <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.Vlans" />
-                               <xml-element java-attribute="networkName" name="network-name" type="java.lang.String" />
-                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
-                               
-                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.L3InterfaceIpv4AddressList" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.L3InterfaceIpv6AddressList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver" />
-                               <xml-property name="container" value="l-interfaces" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Vlans">
-                       <xml-root-element name="vlans" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.Vlan" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Vlan">
-                       <xml-root-element name="vlan" />
-                       <java-attributes>
-                               <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true" />
-                               <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long" />
-                               <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.L3InterfaceIpv4AddressList" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.L3InterfaceIpv6AddressList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="indexedProps" value="vlan-interface" />
-                               <xml-property name="dependentOn" value="l-interface" />
-                               <xml-property name="container" value="vlans" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="L3InterfaceIpv4AddressList">
-                       <xml-root-element name="l3-interface-ipv4-address-list" />
-                       <java-attributes>
-                               <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true" />
-                               <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long" />
-                               <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Indicator of fixed or floating address" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="indexedProps" value="l3-interface-ipv4-address" />
-                               <xml-property name="dependentOn" value="vlan" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="L3InterfaceIpv6AddressList">
-                       <xml-root-element name="l3-interface-ipv6-address-list" />
-                       <java-attributes>
-                               <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true" />
-                               <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long" />
-                               <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Indicator of fixed or floating address" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="indexedProps" value="l3-interface-ipv6-address" />
-                               <xml-property name="dependentOn" value="vlan" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Volumes">
-                       <xml-properties>
-                               <xml-property name="description" value="Block storage volume. In 1504, RO is expected to send this to A&amp;AI." />
-                       </xml-properties>
-                       <xml-root-element name="volumes" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.Volume" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Volume">
-                       <xml-root-element name="volume" />
-                       <java-attributes>
-                               <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID of block storage volume relative to the vserver." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="URL to block storage volume in source of truth" />
-                                       </xml-properties>
-                               </xml-element>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="indexedProps" value="volume-id" />
-                               <xml-property name="dependentOn" value="vserver" />
-                               <xml-property name="container" value="volumes" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Flavors">
-                       <xml-properties>
-                               <xml-property name="description" value="Openstack flavor. In 1504, this REST interface is unused.   The data is populated by RO through    the hand-coded vserver interface rather than through its own REST API.    Expect this to change when we can negotiate with RO to PUT this data or    we change our code to trigger a dispatcher job to go get flavor if it    is missing when RO PUTs a vserver." />
-                       </xml-properties>
-                       <xml-root-element name="flavors" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.Flavor" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Flavor">
-                       <xml-root-element name="flavor" />
-                       <java-attributes>
-                               <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Flavor id, expected to be unique across A&amp;AI." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Flavor name" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Number of CPUs" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Amount of memory" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Disk space" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Amount of ephemeral disk space" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="amount of swap space allocation" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
-                                       <xml-properties>
-                                               <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Link provided by source of truth to get more details." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="nameProps" value="flavor-name" />
-                               <xml-property name="indexedProps" value="flavor-name,flavor-id" />
-                               <xml-property name="uniqueProps" value="flavor-id" />
-                               <xml-property name="container" value="flavors" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Images">
-                       <xml-properties>
-                               <xml-property name="description" value="Openstack image. In 1504, this REST interface is unused. The image data is populated by RO through the hand-coded vserver interface rather than through its own REST API. Expect this to change when we can negotiate with RO to PUT this data or we change our code to trigger a dispatcher job to go get image if it is missing when RO PUTs a vserver." />
-                       </xml-properties>
-                       <xml-root-element name="images" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.Image" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Image">
-                       <xml-root-element name="image" />
-                       <java-attributes>
-                               <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Image id, expected to be unique across A&amp;AI" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Image name" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Operating system architecture." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The common name of the operating system distribution in lowercase" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The operating system version as specified by the distributor." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="application" name="application" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The application that the image instantiates." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The vendor of the application." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The version of the application." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Link provided by source of truth to get more details." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Metadata must include application, application-vendor, and application-version" />
-                               <xml-property name="nameProps" value="image-name" />
-                               <xml-property name="indexedProps" value="image-name,image-id" />
-                               <xml-property name="uniqueProps" value="image-id" />
-                               <xml-property name="container" value="images" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="DvsSwitches">
-                       <xml-properties>
-                               <xml-property name="description" value="Digital Virtual Switch/Virtual Digital Switch container for switch name and vcenter URL, used by SDN-C to configure VCEs.  In 1504, A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. Relationship list is used to link to availability-zone." />
-                       </xml-properties>
-                       <xml-root-element name="dvs-switches" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.DvsSwitch" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="DvsSwitch">
-                       <xml-root-element name="dvs-switch" />
-                       <java-attributes>
-                               <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="DVS switch name" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="URL used to reach the vcenter" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="indexedProps" value="vcenter-url,switch-name" />
-                               <xml-property name="container" value="dvs-switches" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Pservers">
-                       <xml-properties>
-                               <xml-property name="description" value="Compute node. In 1504, this data comes from RCT in a file processed on a schedule defined in crontab. A&amp;AI has code to parse the file and take action on the graph using our REST APIs. Relationship-list is used to link to complex." />
-                       </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.Pserver" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Pserver">
-                       <xml-root-element name="pserver" />
-                       <java-attributes>
-                               <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Value from executing hostname on the compute node." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="PTNII name" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Number of cpus" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Disk size, in GBs" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="RAM size, in MBs" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Fully-qualified domain name" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Link provided by source of truth to get more details." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.PInterfaces" />
-                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.LagInterfaces" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Relationship list must contain related-to of complex with key data of physical-location-id" />
-                               <xml-property name="indexedProps" value="hostname" />
-                               <xml-property name="container" value="pservers" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="PInterfaces">
-                       <xml-root-element name="p-interfaces" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.PInterface" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="PInterface">
-                       <xml-root-element name="p-interface" />
-                       <java-attributes>
-                               <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true" />
-                               <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Captures the numeric part of the speed" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.LInterfaces" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="dependentOn" value="vpls-pe,pserver" />
-                               <xml-property name="container" value="p-interfaces" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="LagInterfaces">
-                       <xml-root-element name="lag-interfaces" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.LagInterface" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="LagInterface">
-                       <xml-root-element name="lag-interface" />
-                       <java-attributes>
-                               <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe" />
-                               <xml-property name="container" value="lag-interfaces" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="OamNetworks">
-                       <xml-properties>
-                               <xml-property name="description" value="Defines the OAM network. In 1504, A&amp;AI expects RO to put all attributes but the ones related to ipv4-oam-gateway-address and prefix. Those need to be hand administered by A&amp;AI through the provisioningTool.sh. Relationship list is used to link to service-capability and complex." />
-                       </xml-properties>
-                       <xml-root-element name="oam-networks" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.OamNetwork" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="OamNetwork">
-                       <xml-root-element name="oam-network" />
-                       <java-attributes>
-                               <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="UUID of the network. Unique across A&amp;AI." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Name of the network." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
-                                       <xml-properties>
-                                               <xml-property name="description" value="cvlan-id" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Relationship list must contain related-to of service-capability with key data service-type and vnf-type                            and related-to of complex with key data of physical-location-id" />
-                               <xml-property name="nameProps" value="network-name" />
-                               <xml-property name="indexedProps" value="network-uuid" />
-                               <xml-property name="container" value="oam-networks" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="AvailabilityZones">
-                       <xml-properties>
-                               <xml-property name="description" value="Availability zones group physical servers.  In 1504, A&amp;AI expects to receive all attributes from RO through REST. Relationship list is used to link to service-capability and complex." />
-                       </xml-properties>
-                       <xml-root-element name="availability-zones" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.AvailabilityZone" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="AvailabilityZone">
-                       <xml-root-element name="availability-zone" />
-                       <java-attributes>
-                               <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Name of the availability zone.  Unique across A&amp;AI for all services." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Relationship list must contain related-to of service-capability with key data service-type and vnf-type                            and related-to of complex with key data of physical-location-id" />
-                               <xml-property name="indexedProps" value="availability-zone-name" />
-                               <xml-property name="container" value="availability-zones" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="VirtualDataCenters">
-                       <xml-properties>
-                               <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-                       </xml-properties>
-                       <xml-root-element name="virtual-data-centers" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.VirtualDataCenter" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="VirtualDataCenter">
-                       <xml-root-element name="virtual-data-center" />
-                       <java-attributes>
-                               <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID of the vdc" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Name of the virtual data center" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-                               <xml-property name="nameProps" value="vdc-name" />
-                               <xml-property name="indexedProps" value="vdc-id" />
-                               <xml-property name="container" value="virtual-data-centers" />
-                               <xml-property name="namespace" value="cloud-infrastructure" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Business">
-                       <xml-root-element name="business" />
-                       <java-attributes>
-                               <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.Customers" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Customers">
-                       <xml-root-element name="customers" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.Customer" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Customer">
-                       <xml-root-element 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-properties>
-                               </xml-element>
-                               <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.ServiceSubscriptions" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="nameProps" value="subscriber-name" />
-                               <xml-property name="indexedProps" value="subscriber-name,global-customer-id" />
-                               <xml-property name="uniqueProps" value="global-customer-id" />
-                               <xml-property name="container" value="customers" />
-                               <xml-property name="namespace" value="business" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="ServiceSubscriptions">
-                       <xml-root-element name="service-subscriptions" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.ServiceSubscription" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ServiceSubscription">
-                       <xml-root-element name="service-subscription" />
-                       <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-properties>
-                               </xml-element>
-                               <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.ServiceInstances">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Relationship-list used to link to cvlantag and vce." />
-                                       </xml-properties>
-                               </xml-element>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="indexedProps" value="service-type" />
-                               <xml-property name="dependentOn" value="customer" />
-                               <xml-property name="container" value="service-subscriptions" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="ServiceInstances">
-                       <xml-root-element name="service-instances" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.ServiceInstance" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ServiceInstance">
-                       <xml-root-element name="service-instance" />
-                       <java-attributes>
-                               <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Corresponds to a customer endpoint for the parent service-subscription." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="indexedProps" value="service-instance-id" />
-                               <xml-property name="uniqueProps" value="service-instance-id" />
-                               <xml-property name="dependentOn" value="service-subscription" />
-                               <xml-property name="container" value="service-instances" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="ServiceDesignAndCreation">
-                       <xml-root-element name="service-design-and-creation" />
-                       <java-attributes>
-                               <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.ServiceCapabilities" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ServiceCapabilities">
-                       <xml-root-element name="service-capabilities" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.ServiceCapability" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ServiceCapability">
-                       <xml-root-element name="service-capability" />
-                       <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="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
-                                       </xml-properties>
-                               </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="This gets defined by others to provide a unique ID for the VNF type, we accept what is sent." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="indexedProps" value="service-type" />
-                               <xml-property name="container" value="service-capabilities" />
-                               <xml-property name="namespace" value="service-design-and-creation" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Network">
-                       <xml-root-element name="network" />
-                       <java-attributes>
-                               <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.LogicalLinks" />
-                               <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.Vces" />
-                               <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.L3Networks" />
-                               <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.GenericVnfs" />
-                               <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.LagLinks" />
-                               <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.Newvces" />
-                               <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.VplsPes" />
-                               <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.PhysicalLinks" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="LogicalLinks">
-                       <xml-root-element name="logical-links" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.LogicalLink" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="LogicalLink">
-                       <xml-root-element name="logical-link" />
-                       <java-attributes>
-                               <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Type of logical link, e.g., evc" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Captures the numeric part of the speed" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="For example, static or BGP" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Logical links can connect l-interfaces" />
-                               <xml-property name="indexedProps" value="link-name" />
-                               <xml-property name="container" value="logical-links" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Vces">
-                       <xml-properties>
-                               <xml-property name="description" value="The 1504 global definition of a vce as from MSO/SDN-C. In 1504, SDN-C will PUT this data and MSO will update it. In addition, A&amp;AI will populate interface-name, v6-vce-wan-address, and ipv4-oam-address based on a RESTCONF call? In 1507, we hope to move to the newvce object, which may need a few more attributes. We need a discussion with MSO about orchestration vs. inventory. " />
-                       </xml-properties>
-                       <xml-root-element name="vces" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.Vce" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Vce">
-                       <xml-root-element name="vce" />
-                       <java-attributes>
-                               <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Name of VNF." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Alternate name of VNF." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Type of VNF.  Source of truth should define and socialize values.                                  Becomes part of the key to service capability" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="License key" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Client should send valid enumerated value" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID of VPE connected to this VCE." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="interfaceName" name="interface-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="e.g., Vce-0/0.0.57" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.PortGroups" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="nameProps" value="vnf-name" />
-                               <xml-property name="indexedProps" value="vnf-name2,vnf-name,heat-stack-id,vnf-id,vpe-id" />
-                               <xml-property name="uniqueProps" value="vnf-id" />
-                               <xml-property name="container" value="vces" />
-                               <xml-property name="namespace" value="network" />
-                               <xml-property name="extends" value="vnf" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="PortGroups">
-                       <xml-root-element name="port-groups" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.PortGroup" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="PortGroup">
-                       <xml-root-element name="port-group" />
-                       <java-attributes>
-                               <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID of the interface" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Neutron network id of this Interface" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Neutron network name of this Interface" />
-                                       </xml-properties>
-                               </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-properties>
-                               </xml-element>
-                               <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID for port group in vmware" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Likely to duplicate value of neutron network name" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.CvlanTags" />
-                       </java-attributes>
-                       <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="heat-stack-id,port-group-id,interface-id,switch-name" />
-                               <xml-property name="dependentOn" value="vce" />
-                               <xml-property name="container" value="port-groups" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="CvlanTags">
-                       <xml-root-element name="cvlan-tags" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.CvlanTagEntry" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="CvlanTagEntry">
-                       <xml-root-element name="cvlan-tag-entry" />
-                       <java-attributes>
-                               <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="See mis-na-virtualization-platform.yang" />
-                                       </xml-properties>
-                               </xml-element>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="dependentOn" value="port-group" />
-                               <xml-property name="indexedProps" value="cvlan-tag" />
-                               <xml-property name="container" value="cvlan-tags" />
-                       </xml-properties>
-               </java-type>
-
-
-
-               <java-type name="L3Networks">
-                       <xml-root-element name="l3-networks" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.L3Network" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="L3Network">
-                       <xml-root-element name="l3-network" />
-                       <java-attributes>
-                               <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Network ID, governed by some naming convention. Unique across A&amp;AI." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="networkUuid" name="network-uuid" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="UUID of the network. Unique across A&amp;AI." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Name of the network, governed by some naming convention.." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Type of the network - who defines these values?" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4GatewayAddress" name="ipv4-gateway-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="IPV4 gateway address" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4Prefix" name="ipv4-prefix" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="IPV4 prefix" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv6GatewayAddress" name="ipv6-gateway-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="IPV6 gateway address" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv6Prefix" name="ipv6-prefix" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="IPV6 prefix" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Generic network definition" />
-                               <xml-property name="nameProps" value="network-name" />
-                               <xml-property name="indexedProps" value="network-uuid,network-id" />
-                               <xml-property name="uniqueProps" value="network-id" />
-                               <xml-property name="container" value="l3-networks" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="GenericVnfs">
-                       <xml-properties>
-                               <xml-property name="description" value="VNF with no special attributes" />
-                       </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.GenericVnf" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="GenericVnf">
-                       <xml-root-element name="generic-vnf" />
-                       <java-attributes>
-                               <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Name of VNF." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Alternate name of VNF." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Type of VNF.  Source of truth should define and socialize values.                                  Becomes part of the key to service capability" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="License key" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Client should send valid enumerated value" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.LInterfaces" />
-                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.LagInterfaces" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="nameProps" value="vnf-name" />
-                               <xml-property name="indexedProps" value="vnf-name2,vnf-name,heat-stack-id,vnf-id" />
-                               <xml-property name="uniqueProps" value="vnf-id" />
-                               <xml-property name="container" value="generic-vnfs" />
-                               <xml-property name="namespace" value="network" />
-                               <xml-property name="extends" value="vnf" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="LagLinks">
-                       <xml-root-element name="lag-links" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.LagLink" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="LagLink">
-                       <xml-root-element name="lag-link" />
-                       <java-attributes>
-                               <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="LAG links can connect lag-interfaces" />
-                               <xml-property name="indexedProps" value="link-name" />
-                               <xml-property name="container" value="lag-links" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="Newvces">
-                       <xml-properties>
-                               <xml-property name="description" value="This is the skeleton of the new VCE object we hope to migrate to in 1507. In 1504, we will use it to store network data gathered from RESTCONF calls to SDN-C. The vnf-id2 leaf needs to be populated with the value of the vce's vnf-id." />
-                       </xml-properties>
-                       <xml-root-element name="newvces" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.Newvce" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Newvce">
-                       <xml-root-element name="newvce" />
-                       <java-attributes>
-                               <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Name of VNF." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Alternate name of VNF." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Type of VNF.  Source of truth should define and socialize values.                                  Becomes part of the key to service capability" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="License key" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Client should send valid enumerated value." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.LInterfaces" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Aspirational VCE object which we'll use to capture additional interface details regarding topology." />
-                               <xml-property name="nameProps" value="vnf-name" />
-                               <xml-property name="indexedProps" value="vnf-name2,vnf-name,heat-stack-id,vnf-id2" />
-                               <xml-property name="uniqueProps" value="vnf-id2" />
-                               <xml-property name="container" value="newvces" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="VplsPes">
-                       <xml-root-element name="vpls-pes" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.VplsPe" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="VplsPe">
-                       <xml-root-element name="vpls-pe" />
-                       <java-attributes>
-                               <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" />
-                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Temporary location for stag to get to VCE" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.PInterfaces" />
-                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.LagInterfaces" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Relationship-list must include related to info for complex." />
-                               <xml-property name="indexedProps" value="equipment-name" />
-                               <xml-property name="container" value="vpls-pes" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="PhysicalLinks">
-                       <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.PhysicalLink" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="PhysicalLink">
-                       <xml-root-element name="physical-link" />
-                       <java-attributes>
-                               <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Captures the numeric part of the speed" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Circuit it" />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Physical links can connect p-interfaces" />
-                               <xml-property name="indexedProps" value="circuit-id,link-name" />
-                               <xml-property name="alternateKeys1" value="circuit-id" />
-                               <xml-property name="container" value="physical-links" />
-                               <xml-property name="namespace" value="network" />
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="NotificationEvent">
-                       <xml-root-element name="notification-event" />
-                       <java-attributes>
-                               <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.NotificationEventHeader" />
-                               <xml-any-element java-attribute="entity" />
-                       </java-attributes>
-               </java-type>
-               <java-type name="NotificationEventHeader">
-                       <xml-root-element name="notification-event-header" />
-                       <java-attributes>
-                               <xml-element java-attribute="id" name="id" type="java.lang.String" />
-                               <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" />
-                               <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" />
-                               <xml-element java-attribute="domain" name="domain" type="java.lang.String" />
-                               <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" />
-                               <xml-element java-attribute="severity" name="severity" type="java.lang.String" />
-                               <xml-element java-attribute="eventType" name="event-type" type="java.lang.String" />
-                               <xml-element java-attribute="version" name="version" type="java.lang.String" />
-                               <xml-element java-attribute="action" name="action" type="java.lang.String" />
-                               <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" />
-                               <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" />
-                               <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" />
-                               <xml-element java-attribute="status" name="status" type="java.lang.String" />
-                       </java-attributes>
-               </java-type>
-               <java-type name="AaiInternal">
-                       <xml-root-element name="aai-internal" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.ReservedPropNames" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.EdgePropNames" />
-                       </java-attributes>
-               </java-type>
-               <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" />
-                               <xml-property name="indexedProps" value="aai-unique-key" />
-                       </xml-properties>
-                       <xml-root-element name="reserved-prop-names" />
-                       <java-attributes>
-                               <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" />
-                               <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" />
-                               <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" />
-                               <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" />
-                               <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" />
-                       </java-attributes>
-               </java-type>
-               <java-type name="EdgePropNames">
-                       <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
-                       <xml-properties>
-                               <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" />
-                               <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
-                       </xml-properties>
-                       <xml-root-element name="edge-prop-names" />
-                       <java-attributes>
-                               <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
-                               <xml-element java-attribute="direction" name="direction" type="java.lang.String" />
-                               <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
-                               <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean" />
-                               <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-                               <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-                               <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" />
-                               <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.String" />
-                       </java-attributes>
-               </java-type>
-               <java-type name="Vnf">
-                       <xml-root-element name="vnf"/>
-                       <java-attributes>
-                               <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-                                       </xml-properties>
-                               </xml-element>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Abstract vnf class" />
-                               <xml-property name="indexedProps" value="vnf-id" />
-                               <xml-property name="uniqueProps" value="vnf-id" />
-                               <xml-property name="inheritors" value="vce,generic-vnf" />
-                               <xml-property name="abstract" value="true" />
-                       </xml-properties>
-               </java-type>
-       </java-types>
-</xml-bindings>