diff options
Diffstat (limited to 'aai-resources')
7 files changed, 600 insertions, 692 deletions
diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml index 765674d..01bc525 100644 --- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml +++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml @@ -309,7 +309,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&T's AIC." /> + <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml index 190fd73..d9e4675 100644 --- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml +++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml @@ -19,7 +19,7 @@ ============LICENSE_END========================================================= --> -<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.att.com.v11" xml-mapping-metadata-complete="true"> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11" /> </xml-schema> @@ -27,15 +27,14 @@ <java-type name="Inventory"> <xml-root-element name="inventory" /> <java-attributes> - <xml-element java-attribute="search" name="search" type="inventory.aai.att.com.v11.Search" /> - <xml-element java-attribute="actions" name="actions" type="inventory.aai.att.com.v11.Actions" /> - <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.att.com.v11.CloudInfrastructure" /> - <xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.att.com.v11.LicenseManagement" /> - <xml-element java-attribute="business" name="business" type="inventory.aai.att.com.v11.Business" /> - <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.att.com.v11.ServiceDesignAndCreation" /> - <xml-element java-attribute="network" name="network" type="inventory.aai.att.com.v11.Network" /> - <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.att.com.v11.AaiInternal" /> - <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.att.com.v11.Nodes"/> + <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v11.Search" /> + <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v11.Actions" /> + <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v11.CloudInfrastructure" /> + <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business" /> + <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation" /> + <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network" /> + <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v11.AaiInternal" /> + <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v11.Nodes"/> </java-attributes> </java-type> @@ -45,24 +44,24 @@ <java-type name="Search"> <xml-root-element name="search" /> <java-attributes> - <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.att.com.v11.EdgeTagQueryResult" /> - <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.att.com.v11.EdgeTagQueryRequest" /> - <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.att.com.v11.SearchResults" /> - <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.att.com.v11.SdnZoneResponse" /> + <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v11.EdgeTagQueryResult" /> + <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v11.EdgeTagQueryRequest" /> + <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v11.SearchResults" /> + <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v11.SdnZoneResponse" /> </java-attributes> </java-type> <java-type name="EdgeTagQueryResult"> <xml-root-element name="edge-tag-query-result" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.att.com.v11.TaggedInventoryItemList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList" /> </java-attributes> </java-type> <java-type name="TaggedInventoryItemList"> <xml-root-element name="tagged-inventory-item-list" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.att.com.v11.InventoryItem" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v11.InventoryItem" /> </java-attributes> </java-type> @@ -71,8 +70,8 @@ <java-attributes> <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" /> <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.att.com.v11.InventoryItemData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.att.com.v11.TaggedInventoryItemList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v11.InventoryItemData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList" /> </java-attributes> </java-type> @@ -90,9 +89,9 @@ <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" /> <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" /> <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.att.com.v11.StartNodeFilter" /> - <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.att.com.v11.IncludeNodeFilter" /> - <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.att.com.v11.SecondaryFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v11.StartNodeFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v11.IncludeNodeFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v11.SecondaryFilter" /> </java-attributes> </java-type> @@ -123,7 +122,7 @@ <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.att.com.v11.ResultData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v11.ResultData" /> </java-attributes> </java-type> @@ -146,16 +145,16 @@ <java-type name="SdnZoneResponse"> <xml-root-element name="sdn-zone-response" /> <java-attributes> - <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.att.com.v11.OamNetworks" /> - <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.att.com.v11.AzAndDvsSwitches" /> + <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" /> + <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v11.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.att.com.v11.DvsSwitches" /> - <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.att.com.v11.AvailabilityZone" /> + <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" /> + <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone" /> </java-attributes> </java-type> @@ -165,8 +164,8 @@ </xml-properties> <xml-root-element name="actions" /> <java-attributes> - <xml-element java-attribute="update" name="update" type="inventory.aai.att.com.v11.Update" /> - <xml-element java-attribute="notify" name="notify" type="inventory.aai.att.com.v11.Notify" /> + <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v11.Update" /> + <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v11.Notify" /> </java-attributes> </java-type> @@ -177,9 +176,9 @@ <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="updateNodeKey" name="update-node-key" type="inventory.aai.att.com.v11.UpdateNodeKey" /> + <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v11.UpdateNodeKey" /> <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.att.com.v11.Action" /> + <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v11.Action" /> </java-attributes> </java-type> @@ -187,7 +186,7 @@ <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.att.com.v11.ActionData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v11.ActionData" /> </java-attributes> </java-type> @@ -213,7 +212,7 @@ <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" /> <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" /> <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.att.com.v11.KeyData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v11.KeyData" /> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" /> </java-attributes> </java-type> @@ -232,18 +231,18 @@ </xml-properties> <xml-root-element name="cloud-infrastructure" /> <java-attributes> - <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.att.com.v11.Complexes" /> - <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.att.com.v11.CloudRegions" /> - <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.att.com.v11.NetworkProfiles" /> - <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.att.com.v11.Pservers" /> - <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.att.com.v11.VirtualDataCenters" /> + <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v11.Complexes" /> + <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v11.CloudRegions" /> + <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v11.NetworkProfiles" /> + <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v11.Pservers" /> + <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v11.VirtualDataCenters" /> </java-attributes> </java-type> <java-type name="CloudRegions"> <xml-root-element name="cloud-regions" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.att.com.v11.CloudRegion" /> + <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v11.CloudRegion" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -255,7 +254,7 @@ <java-attributes> <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" /> + <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" /> </xml-properties> </xml-element> <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true"> @@ -298,19 +297,19 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.att.com.v11.VolumeGroups" /> - <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.att.com.v11.Tenants" /> - <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.att.com.v11.Flavors" /> - <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.att.com.v11.GroupAssignments" /> - <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.att.com.v11.Snapshots" /> - <xml-element java-attribute="images" name="images" type="inventory.aai.att.com.v11.Images" /> - <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.att.com.v11.DvsSwitches" /> - <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.att.com.v11.OamNetworks" /> - <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.att.com.v11.AvailabilityZones" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v11.VolumeGroups" /> + <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v11.Tenants" /> + <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v11.Flavors" /> + <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v11.GroupAssignments" /> + <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v11.Snapshots" /> + <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v11.Images" /> + <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" /> + <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" /> + <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&T's AIC." /> + <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> @@ -323,7 +322,7 @@ </xml-properties> <xml-root-element name="volume-groups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.att.com.v11.VolumeGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v11.VolumeGroup" /> </java-attributes> </java-type> @@ -370,7 +369,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Persistent block-level storage." /> @@ -384,7 +383,7 @@ <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.att.com.v11.Relationship" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v11.Relationship" /> </java-attributes> </java-type> @@ -401,8 +400,8 @@ <xml-property name="description" value="URL to the object in A&AI." /> </xml-properties> </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.att.com.v11.RelationshipData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.att.com.v11.RelatedToProperty" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v11.RelationshipData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v11.RelatedToProperty" /> </java-attributes> </java-type> @@ -444,7 +443,7 @@ </xml-properties> <xml-root-element name="complexes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.att.com.v11.Complex" /> + <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v11.Complex" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -495,8 +494,8 @@ <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.att.com.v11.CtagPools" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v11.CtagPools" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of physical locations that can house cloud-regions." /> @@ -511,7 +510,7 @@ <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.att.com.v11.CtagPool" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v11.CtagPool" /> </java-attributes> </java-type> @@ -543,7 +542,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." /> @@ -559,7 +558,7 @@ </xml-properties> <xml-root-element name="tenants" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.att.com.v11.Tenant" /> + <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v11.Tenant" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -584,8 +583,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.att.com.v11.Vservers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v11.Vservers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack tenant" /> @@ -603,7 +602,7 @@ </xml-properties> <xml-root-element name="vservers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.att.com.v11.Vserver" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v11.Vserver" /> </java-attributes> </java-type> @@ -652,9 +651,9 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.att.com.v11.Volumes" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> + <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v11.Volumes" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." /> @@ -672,7 +671,7 @@ </xml-properties> <xml-root-element name="l-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.att.com.v11.LInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v11.LInterface" /> </java-attributes> </java-type> @@ -741,12 +740,12 @@ <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> </xml-properties> </xml-element> - <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.att.com.v11.Vlans" /> - <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.att.com.v11.SriovVfs" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.att.com.v11.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.att.com.v11.L3InterfaceIpv6AddressList" /> + <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v11.Vlans" /> + <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v11.SriovVfs" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Logical interfaces, e.g., a vnic." /> @@ -762,7 +761,7 @@ </xml-properties> <xml-root-element name="sriov-vfs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.att.com.v11.SriovVf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v11.SriovVf" /> </java-attributes> </java-type> <java-type name="SriovVf"> @@ -838,7 +837,7 @@ <xml-property name="description" value="Neutron network id of the interface" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" /> @@ -891,7 +890,7 @@ <xml-property name="description" value="Neutron id of subnet that address belongs to" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="IPv4 Address Range" /> @@ -903,7 +902,7 @@ <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.att.com.v11.Vlan" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v11.Vlan" /> </java-attributes> </java-type> @@ -966,9 +965,9 @@ <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.att.com.v11.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.att.com.v11.L3InterfaceIpv6AddressList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Definition of vlan" /> @@ -1022,7 +1021,7 @@ <xml-property name="description" value="Neutron id of subnet that address belongs to" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="IPv6 Address Range" /> @@ -1037,7 +1036,7 @@ </xml-properties> <xml-root-element name="volumes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.att.com.v11.Volume" /> + <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v11.Volume" /> </java-attributes> </java-type> @@ -1059,7 +1058,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Ephemeral Block storage volume." /> @@ -1075,7 +1074,7 @@ </xml-properties> <xml-root-element name="flavors" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.att.com.v11.Flavor" /> + <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v11.Flavor" /> </java-attributes> </java-type> @@ -1137,7 +1136,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack flavor." /> @@ -1154,7 +1153,7 @@ </xml-properties> <xml-root-element name="snapshots" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.att.com.v11.Snapshot" /> + <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v11.Snapshot" /> </java-attributes> </java-type> @@ -1216,7 +1215,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack snapshot" /> @@ -1234,7 +1233,7 @@ </xml-properties> <xml-root-element name="group-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.att.com.v11.GroupAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v11.GroupAssignment" /> </java-attributes> </java-type> @@ -1266,7 +1265,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." /> @@ -1283,7 +1282,7 @@ </xml-properties> <xml-root-element name="images" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.att.com.v11.Image" /> + <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v11.Image" /> </java-attributes> </java-type> @@ -1340,8 +1339,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v11.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack image." /> @@ -1358,7 +1357,7 @@ </xml-properties> <xml-root-element name="metadata" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.att.com.v11.Metadatum" /> + <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v11.Metadatum" /> </java-attributes> </java-type> @@ -1387,7 +1386,7 @@ </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.att.com.v11.DvsSwitch" /> + <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v11.DvsSwitch" /> </java-attributes> </java-type> @@ -1409,7 +1408,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs. A&AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&AI. " /> @@ -1425,7 +1424,7 @@ </xml-properties> <xml-root-element name="network-profiles" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.att.com.v11.NetworkProfile" /> + <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v11.NetworkProfile" /> </java-attributes> </java-type> @@ -1447,7 +1446,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" /> @@ -1463,7 +1462,7 @@ </xml-properties> <xml-root-element name="pservers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.att.com.v11.Pserver" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v11.Pserver" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -1599,9 +1598,9 @@ <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.att.com.v11.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v11.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." /> @@ -1619,7 +1618,7 @@ </xml-properties> <xml-root-element name="p-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.att.com.v11.PInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v11.PInterface" /> </java-attributes> </java-type> @@ -1677,8 +1676,8 @@ <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)" /> @@ -1695,7 +1694,7 @@ </xml-properties> <xml-root-element name="lag-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.att.com.v11.LagInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v11.LagInterface" /> </java-attributes> </java-type> @@ -1748,8 +1747,8 @@ <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Link aggregate interface" /> @@ -1765,7 +1764,7 @@ </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.att.com.v11.OamNetwork" /> + <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v11.OamNetwork" /> </java-attributes> </java-type> @@ -1802,7 +1801,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="OAM network, to be deprecated shortly. Do not use for new purposes. " /> @@ -1819,7 +1818,7 @@ </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.att.com.v11.AvailabilityZone" /> + <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone" /> </java-attributes> </java-type> @@ -1846,7 +1845,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" /> @@ -1862,7 +1861,7 @@ </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.att.com.v11.VirtualDataCenter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v11.VirtualDataCenter" /> </java-attributes> </java-type> @@ -1884,7 +1883,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" /> @@ -1895,59 +1894,14 @@ </xml-properties> </java-type> - <java-type name="LicenseManagement"> - <xml-root-element name="license-management" /> - <java-attributes> - <xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.att.com.v11.LicenseKeyResources" /> - </java-attributes> - </java-type> - - <java-type name="LicenseKeyResources"> - <xml-root-element name="license-key-resources" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.att.com.v11.LicenseKeyResource" /> - </java-attributes> - </java-type> - - <java-type name="LicenseKeyResource"> - <xml-root-element name="license-key-resource" /> - <java-attributes> - <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" /> - <xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" /> - <xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" /> - <xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" /> - <xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" /> - <xml-element java-attribute="name" name="name" type="java.lang.String" /> - <xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" /> - <xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" /> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" /> - <xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="OBSOLETE OBJECT: do not use" /> - <xml-property name="nameProps" value="name" /> - <xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" /> - <xml-property name="uniqueProps" value="att-uuid" /> - <xml-property name="container" value="license-key-resources" /> - <xml-property name="namespace" value="license-management" /> - </xml-properties> - </java-type> - <java-type name="Business"> <xml-properties> <xml-property name="description" value="Namespace for business related constructs" /> </xml-properties> <xml-root-element name="business" /> <java-attributes> - <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.att.com.v11.Connectors" /> - <xml-element java-attribute="customers" name="customers" type="inventory.aai.att.com.v11.Customers" /> + <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v11.Connectors" /> + <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v11.Customers" /> </java-attributes> </java-type> @@ -1957,7 +1911,7 @@ </xml-properties> <xml-root-element name="connectors" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.att.com.v11.Connector" /> + <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v11.Connector" /> </java-attributes> </java-type> @@ -2005,8 +1959,8 @@ <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v11.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" /> @@ -2022,7 +1976,7 @@ </xml-properties> <xml-root-element name="customers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.att.com.v11.Customer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v11.Customer" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -2053,8 +2007,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.att.com.v11.ServiceSubscriptions" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v11.ServiceSubscriptions" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." /> @@ -2073,7 +2027,7 @@ </xml-properties> <xml-root-element name="service-subscriptions" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.att.com.v11.ServiceSubscription" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v11.ServiceSubscription" /> </java-attributes> </java-type> @@ -2095,9 +2049,9 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.att.com.v11.ServiceInstances"> + <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v11.ServiceInstances"> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Object that group service instances." /> @@ -2114,7 +2068,7 @@ </xml-properties> <xml-root-element name="service-instances" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.att.com.v11.ServiceInstance" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v11.ServiceInstance" /> </java-attributes> </java-type> @@ -2217,9 +2171,9 @@ <xml-property name="description" value="Orchestration status of this service." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v11.Metadata" /> - <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.att.com.v11.AllottedResources" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> + <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v11.AllottedResources" /> </java-attributes> <xml-properties> <xml-property name="description" value="Instance of a service" /> @@ -2238,11 +2192,11 @@ </xml-properties> <xml-root-element name="service-design-and-creation" /> <java-attributes> - <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.att.com.v11.VnfImages" /> - <xml-element java-attribute="services" name="services" type="inventory.aai.att.com.v11.Services" /> - <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.att.com.v11.ServiceCapabilities" /> - <xml-element java-attribute="models" name="models" type="inventory.aai.att.com.v11.Models" /> - <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.att.com.v11.NamedQueries" /> + <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v11.VnfImages" /> + <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v11.Services" /> + <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v11.ServiceCapabilities" /> + <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v11.Models" /> + <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v11.NamedQueries" /> </java-attributes> </java-type> @@ -2252,14 +2206,14 @@ </xml-properties> <xml-root-element name="vnf-images" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.att.com.v11.VnfImage" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v11.VnfImage" /> </java-attributes> </java-type> <java-type name="VnfImage"> <xml-root-element name="vnf-image" /> <java-attributes> - <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of this asset" /> </xml-properties> @@ -2289,12 +2243,12 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers. This is a kludge." /> - <xml-property name="indexedProps" value="application,att-uuid,application-vendor,application-version" /> - <xml-property name="uniqueProps" value="att-uuid" /> + <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" /> + <xml-property name="uniqueProps" value="vnf-image-uuid" /> <xml-property name="container" value="vnf-images" /> <xml-property name="namespace" value="service-design-and-creation" /> </xml-properties> @@ -2306,7 +2260,7 @@ </xml-properties> <xml-root-element name="services" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.att.com.v11.Service" /> + <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v11.Service" /> </java-attributes> </java-type> @@ -2338,7 +2292,7 @@ <xml-property name="description" value="service version" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Stand-in for service model definitions. Likely to be deprecated in favor of models from ASDC. Does not strictly map to ASDC services." /> @@ -2354,7 +2308,7 @@ </xml-properties> <xml-root-element name="service-capabilities" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.att.com.v11.ServiceCapability" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v11.ServiceCapability" /> </java-attributes> </java-type> @@ -2376,7 +2330,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models. No new use should be made of this." /> @@ -2392,24 +2346,24 @@ </xml-properties> <xml-root-element name="network" /> <java-attributes> - <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.att.com.v11.LogicalLinks" /> - <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.att.com.v11.SitePairSets" /> - <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.att.com.v11.VpnBindings" /> - <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.att.com.v11.VplsPes" /> - <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.att.com.v11.MulticastConfigurations" /> - <xml-element java-attribute="vces" name="vces" type="inventory.aai.att.com.v11.Vces" /> - <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.att.com.v11.Vnfcs" /> - <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.att.com.v11.L3Networks" /> - <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.att.com.v11.NetworkPolicies" /> - <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.att.com.v11.GenericVnfs" /> - <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.att.com.v11.LagLinks" /> - <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.att.com.v11.Newvces" /> - <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.att.com.v11.Pnfs" /> - <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.att.com.v11.PhysicalLinks" /> - <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.att.com.v11.IpsecConfigurations" /> - <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.att.com.v11.RouteTableReferences" /> - <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.att.com.v11.InstanceGroups" /> - <xml-element java-attribute="zones" name="zones" type="inventory.aai.att.com.v11.Zones" /> + <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v11.LogicalLinks" /> + <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v11.SitePairSets" /> + <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v11.VpnBindings" /> + <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v11.VplsPes" /> + <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v11.MulticastConfigurations" /> + <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v11.Vces" /> + <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v11.Vnfcs" /> + <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v11.L3Networks" /> + <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v11.NetworkPolicies" /> + <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v11.GenericVnfs" /> + <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v11.LagLinks" /> + <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v11.Newvces" /> + <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v11.Pnfs" /> + <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v11.PhysicalLinks" /> + <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v11.IpsecConfigurations" /> + <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" /> + <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" /> + <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" /> </java-attributes> </java-type> @@ -2419,7 +2373,7 @@ </xml-properties> <xml-root-element name="logical-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.att.com.v11.LogicalLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v11.LogicalLink" /> </java-attributes> </java-type> @@ -2448,7 +2402,7 @@ </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-property name="description" value="v4, v6, or ds for dual stack" /> </xml-properties> </xml-element> <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String"> @@ -2527,7 +2481,7 @@ <xml-property name="description" value="Reason for this entity, role it is playing" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" /> @@ -2545,7 +2499,7 @@ </xml-properties> <xml-root-element name="site-pair-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.att.com.v11.SitePairSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v11.SitePairSet" /> </java-attributes> </java-type> @@ -2562,8 +2516,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.att.com.v11.RoutingInstances" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v11.RoutingInstances" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Set of instances for probes used to measure service level agreements" /> @@ -2580,7 +2534,7 @@ </xml-properties> <xml-root-element name="routing-instances" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.att.com.v11.RoutingInstance" /> + <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v11.RoutingInstance" /> </java-attributes> </java-type> @@ -2602,8 +2556,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.att.com.v11.SitePairs" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v11.SitePairs" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="routing-instance-id" /> @@ -2619,7 +2573,7 @@ </xml-properties> <xml-root-element name="site-pairs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.att.com.v11.SitePair" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v11.SitePair" /> </java-attributes> </java-type> @@ -2661,8 +2615,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.att.com.v11.ClassesOfService" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v11.ClassesOfService" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="site-pair-id" /> @@ -2678,7 +2632,7 @@ </xml-properties> <xml-root-element name="classes-of-service" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.att.com.v11.ClassOfService" /> + <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v11.ClassOfService" /> </java-attributes> </java-type> @@ -2705,7 +2659,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="cos" /> @@ -2717,7 +2671,7 @@ <java-type name="VpnBindings"> <xml-root-element name="vpn-bindings" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.att.com.v11.VpnBinding" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v11.VpnBinding" /> </java-attributes> </java-type> @@ -2764,7 +2718,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList"> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"> <xml-properties> <xml-property name="description" value="l3-networks relate to vpn-bindings" /> </xml-properties> @@ -2787,7 +2741,7 @@ </xml-properties> <xml-root-element name="vpls-pes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.att.com.v11.VplsPe" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v11.VplsPe" /> </java-attributes> </java-type> @@ -2820,9 +2774,9 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.att.com.v11.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v11.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="VPLS Provider Edge routers." /> @@ -2838,7 +2792,7 @@ </xml-properties> <xml-root-element name="multicast-configurations" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.att.com.v11.MulticastConfiguration" /> + <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v11.MulticastConfiguration" /> </java-attributes> </java-type> @@ -2865,7 +2819,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="multicast-configuration-id" /> @@ -2881,7 +2835,7 @@ </xml-properties> <xml-root-element name="vces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.att.com.v11.Vce" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v11.Vce" /> </java-attributes> </java-type> @@ -2983,10 +2937,10 @@ <xml-property name="description" value="OBSOLETE - see child relationships" /> </xml-properties> </xml-element> - <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.att.com.v11.PortGroups" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.att.com.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.att.com.v11.Entitlements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v11.PortGroups" /> + <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" /> + <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated." /> @@ -3003,7 +2957,7 @@ <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.att.com.v11.PortGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v11.PortGroup" /> </java-attributes> </java-type> @@ -3065,8 +3019,8 @@ <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.att.com.v11.CvlanTags" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v11.CvlanTags" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Used to capture the network interfaces of this VCE" /> @@ -3080,7 +3034,7 @@ <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.att.com.v11.CvlanTagEntry" /> + <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v11.CvlanTagEntry" /> </java-attributes> </java-type> @@ -3097,7 +3051,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="dependentOn" value="port-group" /> @@ -3114,7 +3068,7 @@ </xml-properties> <xml-root-element name="vnfcs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.att.com.v11.Vnfc" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v11.Vnfc" /> </java-attributes> </java-type> @@ -3173,7 +3127,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" /> @@ -3186,7 +3140,7 @@ <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.att.com.v11.L3Network" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v11.L3Network" /> </java-attributes> </java-type> @@ -3333,10 +3287,10 @@ <xml-property name="description" value="Indicator for whether the resource is considered operational." /> </xml-properties> </xml-element> - <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.att.com.v11.Subnets" /> - <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.att.com.v11.CtagAssignments" /> - <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.att.com.v11.SegmentationAssignments" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" > + <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v11.Subnets" /> + <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v11.CtagAssignments" /> + <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v11.SegmentationAssignments" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" > <xml-properties> <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" /> </xml-properties> @@ -3355,7 +3309,7 @@ <java-type name="NetworkPolicies"> <xml-root-element name="network-policies" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.att.com.v11.NetworkPolicy" /> + <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v11.NetworkPolicy" /> </java-attributes> </java-type> <java-type name="NetworkPolicy"> @@ -3381,7 +3335,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="nameProps" value="network-policy-fqdn" /> @@ -3395,7 +3349,7 @@ <java-type name="CtagAssignments"> <xml-root-element name="ctag-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.att.com.v11.CtagAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v11.CtagAssignment" /> </java-attributes> </java-type> @@ -3412,7 +3366,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="vlan-id-inner" /> @@ -3424,7 +3378,7 @@ <java-type name="Subnets"> <xml-root-element name="subnets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.att.com.v11.Subnet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v11.Subnet" /> </java-attributes> </java-type> @@ -3492,7 +3446,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="subnet-id,subnet-name" /> @@ -3509,7 +3463,7 @@ </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.att.com.v11.GenericVnf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v11.GenericVnf" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -3757,12 +3711,12 @@ <xml-property name="description" value="Path to the controller object." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v11.LagInterfaces" /> - <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.att.com.v11.VfModules" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.att.com.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.att.com.v11.Entitlements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> + <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v11.VfModules" /> + <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" /> + <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" /> </java-attributes> <xml-properties> <xml-property name="description" value="General purpose VNF" /> @@ -3782,7 +3736,7 @@ </xml-properties> <xml-root-element name="vf-modules" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.att.com.v11.VfModule" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v11.VfModule" /> </java-attributes> </java-type> @@ -3871,7 +3825,7 @@ <xml-property name="description" value="Path to the controller object." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="a deployment unit of VNFCs" /> @@ -3889,7 +3843,7 @@ </xml-properties> <xml-root-element name="lag-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.att.com.v11.LagLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v11.LagLink" /> </java-attributes> </java-type> @@ -3906,7 +3860,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="LAG links can connect lag-interfaces" /> @@ -3922,7 +3876,7 @@ </xml-properties> <xml-root-element name="newvces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.att.com.v11.Newvce" /> + <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v11.Newvce" /> </java-attributes> </java-type> @@ -3999,8 +3953,8 @@ <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.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf. This object will be retired with vce." /> @@ -4019,7 +3973,7 @@ </xml-properties> <xml-root-element name="pnfs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.att.com.v11.Pnf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v11.Pnf" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -4140,9 +4094,9 @@ <xml-property name="description" value="Nf Role is the role performed by this instance in the network." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.att.com.v11.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v11.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." /> @@ -4160,7 +4114,7 @@ </xml-properties> <xml-root-element name="physical-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.att.com.v11.PhysicalLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v11.PhysicalLink" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -4210,7 +4164,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" /> @@ -4225,7 +4179,7 @@ <java-type name="VigServers"> <xml-root-element name="vig-servers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.att.com.v11.VigServer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v11.VigServer" /> </java-attributes> </java-type> @@ -4252,7 +4206,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" /> @@ -4265,7 +4219,7 @@ <java-type name="IpsecConfigurations"> <xml-root-element name="ipsec-configurations" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.att.com.v11.IpsecConfiguration" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v11.IpsecConfiguration" /> </java-attributes> </java-type> @@ -4382,8 +4336,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.att.com.v11.VigServers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v11.VigServers" /> </java-attributes> <xml-properties> <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" /> @@ -4399,7 +4353,7 @@ <xml-root-element name="notification-event" /> <java-attributes> <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" /> - <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.att.com.v11.NotificationEventHeader" /> + <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v11.NotificationEventHeader" /> <xml-any-element java-attribute="entity" /> </java-attributes> </java-type> @@ -4424,8 +4378,8 @@ <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.att.com.v11.ReservedPropNames" /> - <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.att.com.v11.EdgePropNames" /> + <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v11.ReservedPropNames" /> + <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v11.EdgePropNames" /> </java-attributes> </java-type> <java-type name="ReservedPropNames"> @@ -4470,7 +4424,7 @@ </xml-properties> <xml-root-element name="models" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.att.com.v11.Model" /> + <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v11.Model" /> </java-attributes> </java-type> @@ -4500,8 +4454,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.att.com.v11.ModelVers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> @@ -4509,7 +4463,7 @@ <java-type name="ModelVers"> <xml-root-element name="model-vers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.att.com.v11.ModelVer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v11.ModelVer" /> </java-attributes> </java-type> @@ -4548,16 +4502,16 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.att.com.v11.ModelElements" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v11.Metadata" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="ModelElements"> <xml-root-element name="model-elements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.att.com.v11.ModelElement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v11.ModelElement" /> </java-attributes> </java-type> @@ -4594,24 +4548,24 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.att.com.v11.ModelElements"> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements"> <xml-properties> <xml-property name="description" value="Defines how other models combine to make up a higher-level model" /> </xml-properties> </xml-element> - <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.att.com.v11.ModelConstraints"> + <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v11.ModelConstraints"> <xml-properties> <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="ModelConstraints"> <xml-root-element name="model-constraints" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.att.com.v11.ModelConstraint" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v11.ModelConstraint" /> </java-attributes> </java-type> @@ -4632,7 +4586,7 @@ </xml-properties> </xml-element> <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" /> - <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.att.com.v11.ConstrainedElementSets" /> + <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v11.ConstrainedElementSets" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -4644,7 +4598,7 @@ <java-type name="ConstrainedElementSets"> <xml-root-element name="constrained-element-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.att.com.v11.ConstrainedElementSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v11.ConstrainedElementSet" /> </java-attributes> </java-type> @@ -4667,15 +4621,15 @@ <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" /> <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.att.com.v11.ElementChoiceSets" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v11.ElementChoiceSets" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="ElementChoiceSets"> <xml-root-element name="element-choice-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.att.com.v11.ElementChoiceSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v11.ElementChoiceSet" /> </java-attributes> </java-type> @@ -4698,15 +4652,15 @@ <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" /> <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.att.com.v11.ModelElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="NamedQueries"> <xml-root-element name="named-queries" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.att.com.v11.NamedQuery" /> + <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery" /> </java-attributes> </java-type> @@ -4729,15 +4683,15 @@ </xml-element> <xml-element java-attribute="description" name="description" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.att.com.v11.NamedQueryElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="NamedQueryElements"> <xml-root-element name="named-query-elements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.att.com.v11.NamedQueryElement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v11.NamedQueryElement" /> </java-attributes> </java-type> @@ -4761,17 +4715,17 @@ <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" /> <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" /> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.att.com.v11.NamedQueryElements" /> - <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.att.com.v11.RelatedLookups" /> - <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.att.com.v11.PropertyConstraints" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements" /> + <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v11.RelatedLookups" /> + <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v11.PropertyConstraints" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="RelatedLookups"> <xml-root-element name="related-lookups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.att.com.v11.RelatedLookup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v11.RelatedLookup" /> </java-attributes> </java-type> @@ -4797,14 +4751,14 @@ <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" /> <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="PropertyConstraints"> <xml-root-element name="property-constraints" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.att.com.v11.PropertyConstraint" /> + <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v11.PropertyConstraint" /> </java-attributes> </java-type> @@ -4837,9 +4791,9 @@ </xml-properties> <xml-root-element name="model-and-named-query-search" /> <java-attributes> - <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.att.com.v11.QueryParameters" /> - <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.att.com.v11.InstanceFilters" /> - <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.att.com.v11.SecondaryFilts" /> + <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v11.QueryParameters" /> + <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v11.InstanceFilters" /> + <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v11.SecondaryFilts" /> <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" /> <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" /> </java-attributes> @@ -4851,8 +4805,8 @@ </xml-properties> <xml-root-element name="query-parameters" /> <java-attributes> - <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.att.com.v11.NamedQuery" /> - <xml-element java-attribute="model" name="model" type="inventory.aai.att.com.v11.OverloadedModel" /> + <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery" /> + <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v11.OverloadedModel" /> </java-attributes> </java-type> @@ -4902,8 +4856,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.att.com.v11.ModelVers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> @@ -4913,7 +4867,7 @@ </xml-properties> <xml-root-element name="instance-filters" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.att.com.v11.InstanceFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v11.InstanceFilter" /> </java-attributes> </java-type> @@ -4934,7 +4888,7 @@ </xml-properties> <xml-root-element name="secondary-filts" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.att.com.v11.SecondaryFilt" /> + <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v11.SecondaryFilt" /> </java-attributes> </java-type> @@ -4965,7 +4919,7 @@ </xml-properties> <xml-root-element name="response-list" /> <java-attributes> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.att.com.v11.InventoryResponseItems" /> + <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems" /> </java-attributes> </java-type> @@ -4976,7 +4930,7 @@ </xml-properties> <xml-root-element name="inventory-response-items" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.att.com.v11.InventoryResponseItem" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v11.InventoryResponseItem" /> </java-attributes> </java-type> @@ -4989,8 +4943,8 @@ <java-attributes> <xml-element java-attribute="modelName" name="model-name" type="java.lang.String" /> <xml-any-element java-attribute="item" /> - <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.att.com.v11.ExtraProperties" /> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.att.com.v11.InventoryResponseItems" /> + <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v11.ExtraProperties" /> + <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems" /> </java-attributes> </java-type> @@ -5000,7 +4954,7 @@ </xml-properties> <xml-root-element name="extra-properties" /> <java-attributes> - <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.att.com.v11.ExtraProperty" /> + <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v11.ExtraProperty" /> </java-attributes> </java-type> @@ -5018,7 +4972,7 @@ </xml-properties> <xml-root-element name="route-table-references" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.att.com.v11.RouteTableReference" /> + <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v11.RouteTableReference" /> </java-attributes> </java-type> @@ -5040,7 +4994,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -5059,7 +5013,7 @@ </xml-properties> <xml-root-element name="instance-groups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.att.com.v11.InstanceGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v11.InstanceGroup" /> </java-attributes> </java-type> @@ -5091,7 +5045,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -5111,7 +5065,7 @@ </xml-properties> <xml-root-element name="segmentation-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.att.com.v11.SegmentationAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v11.SegmentationAssignment" /> </java-attributes> </java-type> @@ -5128,7 +5082,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack segmentation assignment." /> @@ -5144,7 +5098,7 @@ </xml-properties> <xml-root-element name="allotted-resources" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.att.com.v11.AllottedResource" /> + <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v11.AllottedResource" /> </java-attributes> </java-type> @@ -5212,8 +5166,8 @@ <xml-property name="description" value="role in the network that this resource will be providing." /> </xml-properties> </xml-element> - <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.att.com.v11.TunnelXconnects" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v11.TunnelXconnects" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -5233,7 +5187,7 @@ </xml-properties> <xml-root-element name="tunnel-xconnects" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.att.com.v11.TunnelXconnect" /> + <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v11.TunnelXconnect" /> </java-attributes> </java-type> @@ -5270,7 +5224,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -5289,7 +5243,7 @@ </xml-properties> <xml-root-element name="entitlements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.att.com.v11.Entitlement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v11.Entitlement" /> </java-attributes> </java-type> @@ -5311,7 +5265,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Metadata for entitlement group." /> @@ -5328,7 +5282,7 @@ </xml-properties> <xml-root-element name="licenses" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.att.com.v11.License" /> + <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v11.License" /> </java-attributes> </java-type> @@ -5350,7 +5304,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Metadata for license group." /> @@ -5384,7 +5338,7 @@ </xml-properties> <xml-root-element name="zones" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.att.com.v11.Zone" /> + <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v11.Zone" /> </java-attributes> </java-type> @@ -5421,7 +5375,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" /> diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml index ae4f8da..fd476cd 100644 --- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml +++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml @@ -302,7 +302,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&T's AIC." /> + <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml index aeeab4c..7c4d401 100644 --- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml +++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml @@ -309,7 +309,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&T's AIC." /> + <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml index e5a8c6d..176a02c 100644 --- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml +++ b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml @@ -307,7 +307,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&T's AIC." /> + <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml index 3721e4f..e59df6c 100644 --- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml +++ b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml @@ -19,7 +19,7 @@ ============LICENSE_END========================================================= --> -<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.att.com.v11" xml-mapping-metadata-complete="true"> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11" /> </xml-schema> @@ -27,15 +27,14 @@ <java-type name="Inventory"> <xml-root-element name="inventory" /> <java-attributes> - <xml-element java-attribute="search" name="search" type="inventory.aai.att.com.v11.Search" /> - <xml-element java-attribute="actions" name="actions" type="inventory.aai.att.com.v11.Actions" /> - <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.att.com.v11.CloudInfrastructure" /> - <xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.att.com.v11.LicenseManagement" /> - <xml-element java-attribute="business" name="business" type="inventory.aai.att.com.v11.Business" /> - <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.att.com.v11.ServiceDesignAndCreation" /> - <xml-element java-attribute="network" name="network" type="inventory.aai.att.com.v11.Network" /> - <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.att.com.v11.AaiInternal" /> - <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.att.com.v11.Nodes"/> + <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v11.Search" /> + <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v11.Actions" /> + <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v11.CloudInfrastructure" /> + <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business" /> + <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation" /> + <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network" /> + <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v11.AaiInternal" /> + <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v11.Nodes"/> </java-attributes> </java-type> @@ -45,24 +44,24 @@ <java-type name="Search"> <xml-root-element name="search" /> <java-attributes> - <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.att.com.v11.EdgeTagQueryResult" /> - <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.att.com.v11.EdgeTagQueryRequest" /> - <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.att.com.v11.SearchResults" /> - <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.att.com.v11.SdnZoneResponse" /> + <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v11.EdgeTagQueryResult" /> + <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v11.EdgeTagQueryRequest" /> + <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v11.SearchResults" /> + <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v11.SdnZoneResponse" /> </java-attributes> </java-type> <java-type name="EdgeTagQueryResult"> <xml-root-element name="edge-tag-query-result" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.att.com.v11.TaggedInventoryItemList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList" /> </java-attributes> </java-type> <java-type name="TaggedInventoryItemList"> <xml-root-element name="tagged-inventory-item-list" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.att.com.v11.InventoryItem" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v11.InventoryItem" /> </java-attributes> </java-type> @@ -71,8 +70,8 @@ <java-attributes> <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" /> <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.att.com.v11.InventoryItemData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.att.com.v11.TaggedInventoryItemList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v11.InventoryItemData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList" /> </java-attributes> </java-type> @@ -90,9 +89,9 @@ <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" /> <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" /> <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.att.com.v11.StartNodeFilter" /> - <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.att.com.v11.IncludeNodeFilter" /> - <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.att.com.v11.SecondaryFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v11.StartNodeFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v11.IncludeNodeFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v11.SecondaryFilter" /> </java-attributes> </java-type> @@ -123,7 +122,7 @@ <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.att.com.v11.ResultData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v11.ResultData" /> </java-attributes> </java-type> @@ -146,16 +145,16 @@ <java-type name="SdnZoneResponse"> <xml-root-element name="sdn-zone-response" /> <java-attributes> - <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.att.com.v11.OamNetworks" /> - <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.att.com.v11.AzAndDvsSwitches" /> + <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" /> + <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v11.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.att.com.v11.DvsSwitches" /> - <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.att.com.v11.AvailabilityZone" /> + <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" /> + <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone" /> </java-attributes> </java-type> @@ -165,8 +164,8 @@ </xml-properties> <xml-root-element name="actions" /> <java-attributes> - <xml-element java-attribute="update" name="update" type="inventory.aai.att.com.v11.Update" /> - <xml-element java-attribute="notify" name="notify" type="inventory.aai.att.com.v11.Notify" /> + <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v11.Update" /> + <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v11.Notify" /> </java-attributes> </java-type> @@ -177,9 +176,9 @@ <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="updateNodeKey" name="update-node-key" type="inventory.aai.att.com.v11.UpdateNodeKey" /> + <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v11.UpdateNodeKey" /> <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.att.com.v11.Action" /> + <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v11.Action" /> </java-attributes> </java-type> @@ -187,7 +186,7 @@ <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.att.com.v11.ActionData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v11.ActionData" /> </java-attributes> </java-type> @@ -213,7 +212,7 @@ <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" /> <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" /> <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.att.com.v11.KeyData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v11.KeyData" /> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" /> </java-attributes> </java-type> @@ -232,18 +231,18 @@ </xml-properties> <xml-root-element name="cloud-infrastructure" /> <java-attributes> - <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.att.com.v11.Complexes" /> - <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.att.com.v11.CloudRegions" /> - <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.att.com.v11.NetworkProfiles" /> - <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.att.com.v11.Pservers" /> - <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.att.com.v11.VirtualDataCenters" /> + <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v11.Complexes" /> + <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v11.CloudRegions" /> + <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v11.NetworkProfiles" /> + <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v11.Pservers" /> + <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v11.VirtualDataCenters" /> </java-attributes> </java-type> <java-type name="CloudRegions"> <xml-root-element name="cloud-regions" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.att.com.v11.CloudRegion" /> + <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v11.CloudRegion" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -255,7 +254,7 @@ <java-attributes> <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" /> + <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" /> </xml-properties> </xml-element> <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true"> @@ -298,19 +297,19 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.att.com.v11.VolumeGroups" /> - <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.att.com.v11.Tenants" /> - <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.att.com.v11.Flavors" /> - <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.att.com.v11.GroupAssignments" /> - <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.att.com.v11.Snapshots" /> - <xml-element java-attribute="images" name="images" type="inventory.aai.att.com.v11.Images" /> - <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.att.com.v11.DvsSwitches" /> - <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.att.com.v11.OamNetworks" /> - <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.att.com.v11.AvailabilityZones" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v11.VolumeGroups" /> + <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v11.Tenants" /> + <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v11.Flavors" /> + <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v11.GroupAssignments" /> + <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v11.Snapshots" /> + <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v11.Images" /> + <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" /> + <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" /> + <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&T's AIC." /> + <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> @@ -323,7 +322,7 @@ </xml-properties> <xml-root-element name="volume-groups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.att.com.v11.VolumeGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v11.VolumeGroup" /> </java-attributes> </java-type> @@ -370,7 +369,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Persistent block-level storage." /> @@ -384,7 +383,7 @@ <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.att.com.v11.Relationship" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v11.Relationship" /> </java-attributes> </java-type> @@ -401,8 +400,8 @@ <xml-property name="description" value="URL to the object in A&AI." /> </xml-properties> </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.att.com.v11.RelationshipData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.att.com.v11.RelatedToProperty" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v11.RelationshipData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v11.RelatedToProperty" /> </java-attributes> </java-type> @@ -444,7 +443,7 @@ </xml-properties> <xml-root-element name="complexes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.att.com.v11.Complex" /> + <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v11.Complex" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -495,8 +494,8 @@ <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.att.com.v11.CtagPools" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v11.CtagPools" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of physical locations that can house cloud-regions." /> @@ -511,7 +510,7 @@ <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.att.com.v11.CtagPool" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v11.CtagPool" /> </java-attributes> </java-type> @@ -543,7 +542,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." /> @@ -559,7 +558,7 @@ </xml-properties> <xml-root-element name="tenants" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.att.com.v11.Tenant" /> + <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v11.Tenant" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -584,8 +583,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.att.com.v11.Vservers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v11.Vservers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack tenant" /> @@ -603,7 +602,7 @@ </xml-properties> <xml-root-element name="vservers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.att.com.v11.Vserver" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v11.Vserver" /> </java-attributes> </java-type> @@ -652,9 +651,9 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.att.com.v11.Volumes" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> + <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v11.Volumes" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." /> @@ -672,7 +671,7 @@ </xml-properties> <xml-root-element name="l-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.att.com.v11.LInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v11.LInterface" /> </java-attributes> </java-type> @@ -741,12 +740,12 @@ <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> </xml-properties> </xml-element> - <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.att.com.v11.Vlans" /> - <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.att.com.v11.SriovVfs" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.att.com.v11.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.att.com.v11.L3InterfaceIpv6AddressList" /> + <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v11.Vlans" /> + <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v11.SriovVfs" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Logical interfaces, e.g., a vnic." /> @@ -762,7 +761,7 @@ </xml-properties> <xml-root-element name="sriov-vfs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.att.com.v11.SriovVf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v11.SriovVf" /> </java-attributes> </java-type> <java-type name="SriovVf"> @@ -838,7 +837,7 @@ <xml-property name="description" value="Neutron network id of the interface" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" /> @@ -891,7 +890,7 @@ <xml-property name="description" value="Neutron id of subnet that address belongs to" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="IPv4 Address Range" /> @@ -903,7 +902,7 @@ <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.att.com.v11.Vlan" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v11.Vlan" /> </java-attributes> </java-type> @@ -966,9 +965,9 @@ <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.att.com.v11.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.att.com.v11.L3InterfaceIpv6AddressList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Definition of vlan" /> @@ -1022,7 +1021,7 @@ <xml-property name="description" value="Neutron id of subnet that address belongs to" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="IPv6 Address Range" /> @@ -1037,7 +1036,7 @@ </xml-properties> <xml-root-element name="volumes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.att.com.v11.Volume" /> + <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v11.Volume" /> </java-attributes> </java-type> @@ -1059,7 +1058,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Ephemeral Block storage volume." /> @@ -1075,7 +1074,7 @@ </xml-properties> <xml-root-element name="flavors" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.att.com.v11.Flavor" /> + <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v11.Flavor" /> </java-attributes> </java-type> @@ -1137,7 +1136,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack flavor." /> @@ -1154,7 +1153,7 @@ </xml-properties> <xml-root-element name="snapshots" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.att.com.v11.Snapshot" /> + <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v11.Snapshot" /> </java-attributes> </java-type> @@ -1216,7 +1215,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack snapshot" /> @@ -1234,7 +1233,7 @@ </xml-properties> <xml-root-element name="group-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.att.com.v11.GroupAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v11.GroupAssignment" /> </java-attributes> </java-type> @@ -1266,7 +1265,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." /> @@ -1283,7 +1282,7 @@ </xml-properties> <xml-root-element name="images" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.att.com.v11.Image" /> + <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v11.Image" /> </java-attributes> </java-type> @@ -1340,8 +1339,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v11.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack image." /> @@ -1358,7 +1357,7 @@ </xml-properties> <xml-root-element name="metadata" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.att.com.v11.Metadatum" /> + <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v11.Metadatum" /> </java-attributes> </java-type> @@ -1387,7 +1386,7 @@ </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.att.com.v11.DvsSwitch" /> + <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v11.DvsSwitch" /> </java-attributes> </java-type> @@ -1409,7 +1408,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs. A&AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&AI. " /> @@ -1425,7 +1424,7 @@ </xml-properties> <xml-root-element name="network-profiles" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.att.com.v11.NetworkProfile" /> + <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v11.NetworkProfile" /> </java-attributes> </java-type> @@ -1447,7 +1446,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" /> @@ -1463,7 +1462,7 @@ </xml-properties> <xml-root-element name="pservers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.att.com.v11.Pserver" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v11.Pserver" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -1600,9 +1599,9 @@ </xml-properties> </xml-element> <xml-element container-type="java.util.ArrayList" java-attribute="testList" name="test-list" type="java.lang.String" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.att.com.v11.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v11.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." /> @@ -1620,7 +1619,7 @@ </xml-properties> <xml-root-element name="p-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.att.com.v11.PInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v11.PInterface" /> </java-attributes> </java-type> @@ -1678,8 +1677,8 @@ <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)" /> @@ -1696,7 +1695,7 @@ </xml-properties> <xml-root-element name="lag-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.att.com.v11.LagInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v11.LagInterface" /> </java-attributes> </java-type> @@ -1749,8 +1748,8 @@ <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Link aggregate interface" /> @@ -1766,7 +1765,7 @@ </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.att.com.v11.OamNetwork" /> + <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v11.OamNetwork" /> </java-attributes> </java-type> @@ -1803,7 +1802,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="OAM network, to be deprecated shortly. Do not use for new purposes. " /> @@ -1820,7 +1819,7 @@ </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.att.com.v11.AvailabilityZone" /> + <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone" /> </java-attributes> </java-type> @@ -1847,7 +1846,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" /> @@ -1863,7 +1862,7 @@ </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.att.com.v11.VirtualDataCenter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v11.VirtualDataCenter" /> </java-attributes> </java-type> @@ -1885,7 +1884,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" /> @@ -1896,59 +1895,14 @@ </xml-properties> </java-type> - <java-type name="LicenseManagement"> - <xml-root-element name="license-management" /> - <java-attributes> - <xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.att.com.v11.LicenseKeyResources" /> - </java-attributes> - </java-type> - - <java-type name="LicenseKeyResources"> - <xml-root-element name="license-key-resources" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.att.com.v11.LicenseKeyResource" /> - </java-attributes> - </java-type> - - <java-type name="LicenseKeyResource"> - <xml-root-element name="license-key-resource" /> - <java-attributes> - <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" /> - <xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" /> - <xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" /> - <xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" /> - <xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" /> - <xml-element java-attribute="name" name="name" type="java.lang.String" /> - <xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" /> - <xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" /> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" /> - <xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="OBSOLETE OBJECT: do not use" /> - <xml-property name="nameProps" value="name" /> - <xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" /> - <xml-property name="uniqueProps" value="att-uuid" /> - <xml-property name="container" value="license-key-resources" /> - <xml-property name="namespace" value="license-management" /> - </xml-properties> - </java-type> - <java-type name="Business"> <xml-properties> <xml-property name="description" value="Namespace for business related constructs" /> </xml-properties> <xml-root-element name="business" /> <java-attributes> - <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.att.com.v11.Connectors" /> - <xml-element java-attribute="customers" name="customers" type="inventory.aai.att.com.v11.Customers" /> + <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v11.Connectors" /> + <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v11.Customers" /> </java-attributes> </java-type> @@ -1958,7 +1912,7 @@ </xml-properties> <xml-root-element name="connectors" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.att.com.v11.Connector" /> + <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v11.Connector" /> </java-attributes> </java-type> @@ -2006,8 +1960,8 @@ <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v11.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" /> @@ -2023,7 +1977,7 @@ </xml-properties> <xml-root-element name="customers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.att.com.v11.Customer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v11.Customer" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -2054,8 +2008,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.att.com.v11.ServiceSubscriptions" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v11.ServiceSubscriptions" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." /> @@ -2074,7 +2028,7 @@ </xml-properties> <xml-root-element name="service-subscriptions" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.att.com.v11.ServiceSubscription" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v11.ServiceSubscription" /> </java-attributes> </java-type> @@ -2096,9 +2050,9 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.att.com.v11.ServiceInstances"> + <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v11.ServiceInstances"> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Object that group service instances." /> @@ -2115,7 +2069,7 @@ </xml-properties> <xml-root-element name="service-instances" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.att.com.v11.ServiceInstance" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v11.ServiceInstance" /> </java-attributes> </java-type> @@ -2218,9 +2172,9 @@ <xml-property name="description" value="Orchestration status of this service." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v11.Metadata" /> - <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.att.com.v11.AllottedResources" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> + <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v11.AllottedResources" /> </java-attributes> <xml-properties> <xml-property name="description" value="Instance of a service" /> @@ -2239,11 +2193,11 @@ </xml-properties> <xml-root-element name="service-design-and-creation" /> <java-attributes> - <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.att.com.v11.VnfImages" /> - <xml-element java-attribute="services" name="services" type="inventory.aai.att.com.v11.Services" /> - <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.att.com.v11.ServiceCapabilities" /> - <xml-element java-attribute="models" name="models" type="inventory.aai.att.com.v11.Models" /> - <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.att.com.v11.NamedQueries" /> + <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v11.VnfImages" /> + <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v11.Services" /> + <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v11.ServiceCapabilities" /> + <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v11.Models" /> + <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v11.NamedQueries" /> </java-attributes> </java-type> @@ -2253,14 +2207,14 @@ </xml-properties> <xml-root-element name="vnf-images" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.att.com.v11.VnfImage" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v11.VnfImage" /> </java-attributes> </java-type> <java-type name="VnfImage"> <xml-root-element name="vnf-image" /> <java-attributes> - <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of this asset" /> </xml-properties> @@ -2290,12 +2244,12 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers. This is a kludge." /> - <xml-property name="indexedProps" value="application,att-uuid,application-vendor,application-version" /> - <xml-property name="uniqueProps" value="att-uuid" /> + <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" /> + <xml-property name="uniqueProps" value="vnf-image-uuid" /> <xml-property name="container" value="vnf-images" /> <xml-property name="namespace" value="service-design-and-creation" /> </xml-properties> @@ -2307,7 +2261,7 @@ </xml-properties> <xml-root-element name="services" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.att.com.v11.Service" /> + <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v11.Service" /> </java-attributes> </java-type> @@ -2339,7 +2293,7 @@ <xml-property name="description" value="service version" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Stand-in for service model definitions. Likely to be deprecated in favor of models from ASDC. Does not strictly map to ASDC services." /> @@ -2355,7 +2309,7 @@ </xml-properties> <xml-root-element name="service-capabilities" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.att.com.v11.ServiceCapability" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v11.ServiceCapability" /> </java-attributes> </java-type> @@ -2377,7 +2331,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models. No new use should be made of this." /> @@ -2393,26 +2347,26 @@ </xml-properties> <xml-root-element name="network" /> <java-attributes> - <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.att.com.v11.LogicalLinks" /> - <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.att.com.v11.SitePairSets" /> - <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.att.com.v11.VpnBindings" /> - <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.att.com.v11.VplsPes" /> - <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.att.com.v11.MulticastConfigurations" /> - <xml-element java-attribute="vces" name="vces" type="inventory.aai.att.com.v11.Vces" /> - <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.att.com.v11.Vnfcs" /> - <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.att.com.v11.L3Networks" /> - <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.att.com.v11.NetworkPolicies" /> - <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.att.com.v11.GenericVnfs" /> - <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.att.com.v11.LagLinks" /> - <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.att.com.v11.Newvces" /> - <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.att.com.v11.Pnfs" /> - <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.att.com.v11.PhysicalLinks" /> - <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.att.com.v11.IpsecConfigurations" /> - <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.att.com.v11.RouteTableReferences" /> - <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.att.com.v11.InstanceGroups" /> - <xml-element java-attribute="zones" name="zones" type="inventory.aai.att.com.v11.Zones" /> + <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v11.LogicalLinks" /> + <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v11.SitePairSets" /> + <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v11.VpnBindings" /> + <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v11.VplsPes" /> + <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v11.MulticastConfigurations" /> + <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v11.Vces" /> + <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v11.Vnfcs" /> + <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v11.L3Networks" /> + <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v11.NetworkPolicies" /> + <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v11.GenericVnfs" /> + <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v11.LagLinks" /> + <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v11.Newvces" /> + <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v11.Pnfs" /> + <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v11.PhysicalLinks" /> + <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v11.IpsecConfigurations" /> + <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" /> + <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" /> + <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" /> <xml-element java-attribute="testObjects" name="test-objects" - type="inventory.aai.att.com.v11.TestObjects" /> + type="inventory.aai.onap.org.v11.TestObjects" /> </java-attributes> </java-type> @@ -2422,7 +2376,7 @@ </xml-properties> <xml-root-element name="logical-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.att.com.v11.LogicalLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v11.LogicalLink" /> </java-attributes> </java-type> @@ -2451,7 +2405,7 @@ </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-property name="description" value="v4, v6, or ds for dual stack" /> </xml-properties> </xml-element> <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String"> @@ -2530,7 +2484,7 @@ <xml-property name="description" value="Reason for this entity, role it is playing" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" /> @@ -2548,7 +2502,7 @@ </xml-properties> <xml-root-element name="site-pair-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.att.com.v11.SitePairSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v11.SitePairSet" /> </java-attributes> </java-type> @@ -2565,8 +2519,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.att.com.v11.RoutingInstances" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v11.RoutingInstances" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Set of instances for probes used to measure service level agreements" /> @@ -2583,7 +2537,7 @@ </xml-properties> <xml-root-element name="routing-instances" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.att.com.v11.RoutingInstance" /> + <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v11.RoutingInstance" /> </java-attributes> </java-type> @@ -2605,8 +2559,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.att.com.v11.SitePairs" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v11.SitePairs" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="routing-instance-id" /> @@ -2622,7 +2576,7 @@ </xml-properties> <xml-root-element name="site-pairs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.att.com.v11.SitePair" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v11.SitePair" /> </java-attributes> </java-type> @@ -2664,8 +2618,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.att.com.v11.ClassesOfService" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v11.ClassesOfService" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="site-pair-id" /> @@ -2681,7 +2635,7 @@ </xml-properties> <xml-root-element name="classes-of-service" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.att.com.v11.ClassOfService" /> + <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v11.ClassOfService" /> </java-attributes> </java-type> @@ -2708,7 +2662,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="cos" /> @@ -2720,7 +2674,7 @@ <java-type name="VpnBindings"> <xml-root-element name="vpn-bindings" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.att.com.v11.VpnBinding" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v11.VpnBinding" /> </java-attributes> </java-type> @@ -2767,9 +2721,9 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.att.com.v11.RouteTargets" /> + <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v11.RouteTargets" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList"> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"> <xml-properties> <xml-property name="description" value="l3-networks relate to vpn-bindings" /> </xml-properties> @@ -2791,7 +2745,7 @@ </xml-properties> <xml-root-element name="route-targets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.att.com.v11.RouteTarget" /> + <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v11.RouteTarget" /> </java-attributes> </java-type> <java-type name="RouteTarget"> @@ -2812,7 +2766,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Route target information" /> @@ -2826,7 +2780,7 @@ </xml-properties> <xml-root-element name="vpls-pes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.att.com.v11.VplsPe" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v11.VplsPe" /> </java-attributes> </java-type> @@ -2859,9 +2813,9 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.att.com.v11.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v11.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="VPLS Provider Edge routers." /> @@ -2877,7 +2831,7 @@ </xml-properties> <xml-root-element name="multicast-configurations" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.att.com.v11.MulticastConfiguration" /> + <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v11.MulticastConfiguration" /> </java-attributes> </java-type> @@ -2904,7 +2858,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="multicast-configuration-id" /> @@ -2920,7 +2874,7 @@ </xml-properties> <xml-root-element name="vces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.att.com.v11.Vce" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v11.Vce" /> </java-attributes> </java-type> @@ -3022,10 +2976,10 @@ <xml-property name="description" value="OBSOLETE - see child relationships" /> </xml-properties> </xml-element> - <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.att.com.v11.PortGroups" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.att.com.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.att.com.v11.Entitlements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v11.PortGroups" /> + <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" /> + <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated." /> @@ -3042,7 +2996,7 @@ <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.att.com.v11.PortGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v11.PortGroup" /> </java-attributes> </java-type> @@ -3104,8 +3058,8 @@ <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.att.com.v11.CvlanTags" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v11.CvlanTags" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Used to capture the network interfaces of this VCE" /> @@ -3119,7 +3073,7 @@ <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.att.com.v11.CvlanTagEntry" /> + <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v11.CvlanTagEntry" /> </java-attributes> </java-type> @@ -3136,7 +3090,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="dependentOn" value="port-group" /> @@ -3153,7 +3107,7 @@ </xml-properties> <xml-root-element name="vnfcs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.att.com.v11.Vnfc" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v11.Vnfc" /> </java-attributes> </java-type> @@ -3212,7 +3166,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" /> @@ -3225,7 +3179,7 @@ <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.att.com.v11.L3Network" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v11.L3Network" /> </java-attributes> </java-type> @@ -3372,10 +3326,10 @@ <xml-property name="description" value="Indicator for whether the resource is considered operational." /> </xml-properties> </xml-element> - <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.att.com.v11.Subnets" /> - <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.att.com.v11.CtagAssignments" /> - <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.att.com.v11.SegmentationAssignments" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" > + <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v11.Subnets" /> + <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v11.CtagAssignments" /> + <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v11.SegmentationAssignments" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" > <xml-properties> <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" /> </xml-properties> @@ -3394,7 +3348,7 @@ <java-type name="NetworkPolicies"> <xml-root-element name="network-policies" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.att.com.v11.NetworkPolicy" /> + <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v11.NetworkPolicy" /> </java-attributes> </java-type> <java-type name="NetworkPolicy"> @@ -3420,7 +3374,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="nameProps" value="network-policy-fqdn" /> @@ -3434,7 +3388,7 @@ <java-type name="CtagAssignments"> <xml-root-element name="ctag-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.att.com.v11.CtagAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v11.CtagAssignment" /> </java-attributes> </java-type> @@ -3451,7 +3405,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="vlan-id-inner" /> @@ -3463,7 +3417,7 @@ <java-type name="Subnets"> <xml-root-element name="subnets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.att.com.v11.Subnet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v11.Subnet" /> </java-attributes> </java-type> @@ -3531,7 +3485,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="subnet-id,subnet-name" /> @@ -3548,7 +3502,7 @@ </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.att.com.v11.GenericVnf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v11.GenericVnf" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -3796,12 +3750,12 @@ <xml-property name="description" value="Path to the controller object." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v11.LagInterfaces" /> - <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.att.com.v11.VfModules" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.att.com.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.att.com.v11.Entitlements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> + <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v11.VfModules" /> + <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" /> + <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" /> </java-attributes> <xml-properties> <xml-property name="description" value="General purpose VNF" /> @@ -3821,7 +3775,7 @@ </xml-properties> <xml-root-element name="vf-modules" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.att.com.v11.VfModule" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v11.VfModule" /> </java-attributes> </java-type> @@ -3910,7 +3864,7 @@ <xml-property name="description" value="Path to the controller object." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="a deployment unit of VNFCs" /> @@ -3928,7 +3882,7 @@ </xml-properties> <xml-root-element name="lag-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.att.com.v11.LagLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v11.LagLink" /> </java-attributes> </java-type> @@ -3945,7 +3899,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="LAG links can connect lag-interfaces" /> @@ -3961,7 +3915,7 @@ </xml-properties> <xml-root-element name="newvces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.att.com.v11.Newvce" /> + <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v11.Newvce" /> </java-attributes> </java-type> @@ -4038,8 +3992,8 @@ <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.att.com.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v11.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf. This object will be retired with vce." /> @@ -4058,7 +4012,7 @@ </xml-properties> <xml-root-element name="pnfs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.att.com.v11.Pnf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v11.Pnf" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -4179,9 +4133,9 @@ <xml-property name="description" value="Nf Role is the role performed by this instance in the network." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.att.com.v11.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v11.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." /> @@ -4199,7 +4153,7 @@ </xml-properties> <xml-root-element name="physical-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.att.com.v11.PhysicalLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v11.PhysicalLink" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -4249,7 +4203,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" /> @@ -4264,7 +4218,7 @@ <java-type name="VigServers"> <xml-root-element name="vig-servers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.att.com.v11.VigServer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v11.VigServer" /> </java-attributes> </java-type> @@ -4291,7 +4245,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" /> @@ -4304,7 +4258,7 @@ <java-type name="IpsecConfigurations"> <xml-root-element name="ipsec-configurations" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.att.com.v11.IpsecConfiguration" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v11.IpsecConfiguration" /> </java-attributes> </java-type> @@ -4421,8 +4375,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> - <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.att.com.v11.VigServers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v11.VigServers" /> </java-attributes> <xml-properties> <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" /> @@ -4438,7 +4392,7 @@ <xml-root-element name="notification-event" /> <java-attributes> <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" /> - <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.att.com.v11.NotificationEventHeader" /> + <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v11.NotificationEventHeader" /> <xml-any-element java-attribute="entity" /> </java-attributes> </java-type> @@ -4463,8 +4417,8 @@ <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.att.com.v11.ReservedPropNames" /> - <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.att.com.v11.EdgePropNames" /> + <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v11.ReservedPropNames" /> + <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v11.EdgePropNames" /> </java-attributes> </java-type> <java-type name="ReservedPropNames"> @@ -4509,7 +4463,7 @@ </xml-properties> <xml-root-element name="models" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.att.com.v11.Model" /> + <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v11.Model" /> </java-attributes> </java-type> @@ -4539,8 +4493,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.att.com.v11.ModelVers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> @@ -4548,7 +4502,7 @@ <java-type name="ModelVers"> <xml-root-element name="model-vers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.att.com.v11.ModelVer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v11.ModelVer" /> </java-attributes> </java-type> @@ -4587,16 +4541,16 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.att.com.v11.ModelElements" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v11.Metadata" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="ModelElements"> <xml-root-element name="model-elements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.att.com.v11.ModelElement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v11.ModelElement" /> </java-attributes> </java-type> @@ -4633,24 +4587,24 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.att.com.v11.ModelElements"> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements"> <xml-properties> <xml-property name="description" value="Defines how other models combine to make up a higher-level model" /> </xml-properties> </xml-element> - <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.att.com.v11.ModelConstraints"> + <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v11.ModelConstraints"> <xml-properties> <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="ModelConstraints"> <xml-root-element name="model-constraints" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.att.com.v11.ModelConstraint" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v11.ModelConstraint" /> </java-attributes> </java-type> @@ -4671,7 +4625,7 @@ </xml-properties> </xml-element> <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" /> - <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.att.com.v11.ConstrainedElementSets" /> + <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v11.ConstrainedElementSets" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -4683,7 +4637,7 @@ <java-type name="ConstrainedElementSets"> <xml-root-element name="constrained-element-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.att.com.v11.ConstrainedElementSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v11.ConstrainedElementSet" /> </java-attributes> </java-type> @@ -4706,15 +4660,15 @@ <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" /> <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.att.com.v11.ElementChoiceSets" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v11.ElementChoiceSets" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="ElementChoiceSets"> <xml-root-element name="element-choice-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.att.com.v11.ElementChoiceSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v11.ElementChoiceSet" /> </java-attributes> </java-type> @@ -4737,15 +4691,15 @@ <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" /> <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.att.com.v11.ModelElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="NamedQueries"> <xml-root-element name="named-queries" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.att.com.v11.NamedQuery" /> + <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery" /> </java-attributes> </java-type> @@ -4768,15 +4722,15 @@ </xml-element> <xml-element java-attribute="description" name="description" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.att.com.v11.NamedQueryElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="NamedQueryElements"> <xml-root-element name="named-query-elements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.att.com.v11.NamedQueryElement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v11.NamedQueryElement" /> </java-attributes> </java-type> @@ -4800,17 +4754,17 @@ <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" /> <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" /> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.att.com.v11.NamedQueryElements" /> - <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.att.com.v11.RelatedLookups" /> - <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.att.com.v11.PropertyConstraints" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements" /> + <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v11.RelatedLookups" /> + <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v11.PropertyConstraints" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="RelatedLookups"> <xml-root-element name="related-lookups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.att.com.v11.RelatedLookup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v11.RelatedLookup" /> </java-attributes> </java-type> @@ -4836,14 +4790,14 @@ <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" /> <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> <java-type name="PropertyConstraints"> <xml-root-element name="property-constraints" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.att.com.v11.PropertyConstraint" /> + <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v11.PropertyConstraint" /> </java-attributes> </java-type> @@ -4876,9 +4830,9 @@ </xml-properties> <xml-root-element name="model-and-named-query-search" /> <java-attributes> - <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.att.com.v11.QueryParameters" /> - <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.att.com.v11.InstanceFilters" /> - <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.att.com.v11.SecondaryFilts" /> + <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v11.QueryParameters" /> + <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v11.InstanceFilters" /> + <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v11.SecondaryFilts" /> <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" /> <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" /> </java-attributes> @@ -4890,8 +4844,8 @@ </xml-properties> <xml-root-element name="query-parameters" /> <java-attributes> - <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.att.com.v11.NamedQuery" /> - <xml-element java-attribute="model" name="model" type="inventory.aai.att.com.v11.OverloadedModel" /> + <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery" /> + <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v11.OverloadedModel" /> </java-attributes> </java-type> @@ -4941,8 +4895,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.att.com.v11.ModelVers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> </java-type> @@ -4952,7 +4906,7 @@ </xml-properties> <xml-root-element name="instance-filters" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.att.com.v11.InstanceFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v11.InstanceFilter" /> </java-attributes> </java-type> @@ -4973,7 +4927,7 @@ </xml-properties> <xml-root-element name="secondary-filts" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.att.com.v11.SecondaryFilt" /> + <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v11.SecondaryFilt" /> </java-attributes> </java-type> @@ -5004,7 +4958,7 @@ </xml-properties> <xml-root-element name="response-list" /> <java-attributes> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.att.com.v11.InventoryResponseItems" /> + <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems" /> </java-attributes> </java-type> @@ -5015,7 +4969,7 @@ </xml-properties> <xml-root-element name="inventory-response-items" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.att.com.v11.InventoryResponseItem" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v11.InventoryResponseItem" /> </java-attributes> </java-type> @@ -5028,8 +4982,8 @@ <java-attributes> <xml-element java-attribute="modelName" name="model-name" type="java.lang.String" /> <xml-any-element java-attribute="item" /> - <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.att.com.v11.ExtraProperties" /> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.att.com.v11.InventoryResponseItems" /> + <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v11.ExtraProperties" /> + <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems" /> </java-attributes> </java-type> @@ -5039,7 +4993,7 @@ </xml-properties> <xml-root-element name="extra-properties" /> <java-attributes> - <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.att.com.v11.ExtraProperty" /> + <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v11.ExtraProperty" /> </java-attributes> </java-type> @@ -5057,7 +5011,7 @@ </xml-properties> <xml-root-element name="route-table-references" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.att.com.v11.RouteTableReference" /> + <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v11.RouteTableReference" /> </java-attributes> </java-type> @@ -5079,7 +5033,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -5098,7 +5052,7 @@ </xml-properties> <xml-root-element name="instance-groups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.att.com.v11.InstanceGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v11.InstanceGroup" /> </java-attributes> </java-type> @@ -5130,7 +5084,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -5150,7 +5104,7 @@ </xml-properties> <xml-root-element name="segmentation-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.att.com.v11.SegmentationAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v11.SegmentationAssignment" /> </java-attributes> </java-type> @@ -5167,7 +5121,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack segmentation assignment." /> @@ -5183,7 +5137,7 @@ </xml-properties> <xml-root-element name="allotted-resources" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.att.com.v11.AllottedResource" /> + <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v11.AllottedResource" /> </java-attributes> </java-type> @@ -5251,8 +5205,8 @@ <xml-property name="description" value="role in the network that this resource will be providing." /> </xml-properties> </xml-element> - <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.att.com.v11.TunnelXconnects" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v11.TunnelXconnects" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -5272,7 +5226,7 @@ </xml-properties> <xml-root-element name="tunnel-xconnects" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.att.com.v11.TunnelXconnect" /> + <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v11.TunnelXconnect" /> </java-attributes> </java-type> @@ -5309,7 +5263,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -5328,7 +5282,7 @@ </xml-properties> <xml-root-element name="entitlements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.att.com.v11.Entitlement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v11.Entitlement" /> </java-attributes> </java-type> @@ -5350,7 +5304,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Metadata for entitlement group." /> @@ -5367,7 +5321,7 @@ </xml-properties> <xml-root-element name="licenses" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.att.com.v11.License" /> + <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v11.License" /> </java-attributes> </java-type> @@ -5389,7 +5343,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Metadata for license group." /> @@ -5423,7 +5377,7 @@ </xml-properties> <xml-root-element name="zones" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.att.com.v11.Zone" /> + <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v11.Zone" /> </java-attributes> </java-type> @@ -5460,7 +5414,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" /> @@ -5479,7 +5433,7 @@ <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="testObject" name="test-object" - type="inventory.aai.att.com.v11.TestObject" /> + type="inventory.aai.onap.org.v11.TestObject" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -5819,8 +5773,8 @@ <xml-property name="description" value="Path to the controller object." /> </xml-properties> </xml-element> - <xml-element java-attribute="testObjects" name="test-objects" type="inventory.aai.att.com.v11.TestObjects" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v11.RelationshipList" /> + <xml-element java-attribute="testObjects" name="test-objects" type="inventory.aai.onap.org.v11.TestObjects" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml index d30636e..126f286 100644 --- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml +++ b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml @@ -307,7 +307,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&T's AIC." /> + <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> |