Change openecomp to onap and update license
[aai/aai-common.git] / aai-core / src / test / resources / bundleconfig-local / etc / oxm / aai_oxm_v11.xml
index 1c49cf1..ecbfefb 100644 (file)
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  ============LICENSE_START=======================================================
-  org.openecomp.aai
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+    ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
+-->
 <xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true">
        <xml-schema element-form-default="QUALIFIED">
                <xml-ns namespace-uri="http://org.onap.aai.inventory/v11" />
@@ -30,6 +33,7 @@
                                <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="licenseManagement" name="license-management" type="inventory.aai.onap.org.v11.LicenseManagement" />
                                <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" />
                        <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. First part of composite key should be formatted as vendor-cloudname" />
+                                               <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-properties>
                                </xml-element>
                                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
                                <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." />
+                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;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&amp;T's AIC." />
                                <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" />
                                                <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="vfModulemodelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String">
+                               <xml-element java-attribute="vfModuleModelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group" />
                                        </xml-properties>
                                        <xml-properties>
                                                <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Human friendly text regarding this interface." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                  
+                               <xml-element java-attribute="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="boolean indicatating whether or not port is a mirrored." />
+                                       </xml-properties>
+                               </xml-element>                                  
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                       </xml-properties>
+                               </xml-element>                          
                                <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" />
                                        <xml-properties>
                                                <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                                  
                                <xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
                                                <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." />
                                        </xml-properties>
                                </xml-element>
+                                       <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                       </xml-properties>
+                               </xml-element>                  
                                <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" />
                                <xml-property name="container" value="flavors" />
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="Snapshots">
                        <xml-properties>
                                <xml-property name="description" value="Collection of openstack snapshots" />
                        <xml-root-element name="snapshots" />
                        <java-attributes>
                                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v11.Snapshot" />
-                       </java-attributes>
+                       </java-attributes>              
                </java-type>
-
+               
                <java-type name="Snapshot">
                        <xml-root-element name="snapshot" />
                        <java-attributes>
                                <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" />
                                <xml-property name="dependentOn" value="cloud-region" />
                                <xml-property name="container" value="snapshots" />
-                       </xml-properties>
+                       </xml-properties>       
                </java-type>
-
+               
                <java-type name="GroupAssignments">
                        <xml-properties>
                                <xml-property name="description" value="Collection of openstack group assignments" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v11.GroupAssignment" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="GroupAssignment">
                        <xml-root-element name="group-assignment" />
                        <java-attributes>
                                        <xml-properties>
                                                <xml-property name="description" value="Group type - the type of group this instance refers to" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                          
                                <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Group name - name assigned to the group" />
                                        <xml-properties>
                                                <xml-property name="description" value="Group description - description of the group" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>          
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="dependentOn" value="cloud-region" />
                                <xml-property name="container" value="group-assignments" />
                        </xml-properties>
-               </java-type>
+               </java-type>                    
 
                <java-type name="Images">
                        <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 default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                       </xml-properties>
+                               </xml-element>
                                <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="Human friendly text regarding this interface." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                                                <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                       </xml-properties>
+                               </xml-element>
                                <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" />
-                               <xml-property name="indexedProps" value="interface-name" />
-                               <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe" />
+                               <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" />
+                               <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" />
                                <xml-property name="container" value="lag-interfaces" />
                        </xml-properties>
                </java-type>
                        </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.onap.org.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.onap.org.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.onap.org.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-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="personaModelId" name="persona-model-id" type="java.lang.String">
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
-                               <xml-property name="indexedProps" value="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version" />
+                               <xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version" />
                                <xml-property name="container" value="connectors" />
                                <xml-property name="namespace" value="business" />
                        </xml-properties>
                                                <xml-property name="description" value="This field will store a name assigned to the service-instance." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Instance of a service" />
-                               <xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status" />
+                               <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status" />
                                <xml-property name="nameProps" value="service-instance-name" />
                                <xml-property name="searchable" value="service-instance-id,service-instance-name" />
                                <xml-property name="uniqueProps" value="service-instance-id" />
                <java-type name="VnfImage">
                        <xml-root-element name="vnf-image" />
                        <java-attributes>
-                               <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true">
+                               <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
                                                <xml-property name="description" value="Unique ID of this asset" />
                                        </xml-properties>
                        </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,vnf-image-uuid,application-vendor,application-version" />
-                               <xml-property name="uniqueProps" value="vnf-image-uuid" />
+                               <xml-property name="indexedProps" value="application,att-uuid,application-vendor,application-version" />
+                               <xml-property name="uniqueProps" value="att-uuid" />
                                <xml-property name="container" value="vnf-images" />
                                <xml-property name="namespace" value="service-design-and-creation" />
                        </xml-properties>
                                <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.onap.org.v11.TestObjects" />
                        </java-attributes>
                </java-type>
 
                                </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" />
+                                               <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
                                                <xml-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="personaModelId" name="persona-model-id" type="java.lang.String">
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                        </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" />
-                               <xml-property name="indexedProps" value="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" />
+                               <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" />
                                <xml-property name="uniqueProps" value="link-id" />
                                <xml-property name="container" value="logical-links" />
                                <xml-property name="namespace" value="network" />
                                        <xml-properties>
                                                <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                                  
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                                                <xml-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.onap.org.v11.RouteTargets" />
+                               
                                <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-property name="namespace" value="network" />
                        </xml-properties>
                </java-type>
-
+               <java-type name="RouteTargets">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of route target information" />
+                       </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.onap.org.v11.RouteTarget" />
+                       </java-attributes>
+               </java-type>
+               <java-type name="RouteTarget">
+                       <xml-root-element name="route-target" />
+                       <java-attributes>
+                               <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" xml-key="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Number used to identify an RT, globally unique in the network" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" xml-key="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Role assigned to this route target" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Route target information" />
+                               <xml-property name="container" value="route-targets" />
+                               <xml-property name="canBeLinked" value="true" />
+                       </xml-properties>
+               </java-type>
                <java-type name="VplsPes">
                        <xml-properties>
                                <xml-property name="description" value="Collection of VPLS Provider Edge routers" />
                                                <xml-property name="description" value="Contrail FQDN for the network" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                        <xml-properties>
                                <xml-property name="description" value="Generic network definition" />
                                <xml-property name="nameProps" value="network-name" />
-                               <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
+                               <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
                                <xml-property name="searchable" value="network-id,network-name" />
                                <xml-property name="uniqueProps" value="network-id" />
                                <xml-property name="container" value="l3-networks" />
                                                <xml-property name="description" value="UUID of the actual license resource.  OBSOLETE -  See child relationships." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="role in the network that this model will be providing" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="string assigned to this model used for naming purposes" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Path to the controller object." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                          
                                <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-properties>
                                <xml-property name="description" value="General purpose VNF" />
                                <xml-property name="nameProps" value="vnf-name" />
-                               <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role" />
+                               <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role" />
                                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
                                <xml-property name="uniqueProps" value="vnf-id" />
                                <xml-property name="container" value="generic-vnfs" />
                                                <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="personaModelId" name="persona-model-id" type="java.lang.String">
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="a deployment unit of VNFCs" />
-                               <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn" />
+                               <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn" />
                                <xml-property name="searchable" value="vf-module-id,vf-module-name" />
                                <xml-property name="dependentOn" value="generic-vnf" />
                                <xml-property name="container" value="vf-modules" />
                                        <xml-properties>
                                                <xml-property name="description" value="Name of the service Provider on this link." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                                  
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,? aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
                                </xml-element>
                                <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,? aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
                                <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean" />
                                <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
                                <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-                               <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" />
-                               <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.String" />
+                               <xml-element java-attribute="svcInfra" name="svcInfra" type="java.lang.String" />
+                               <xml-element java-attribute="svcInfraRev" name="svcInfraRev" type="java.lang.String" />
                        </java-attributes>
                </java-type>
 
                                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v11.ModelVer" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="ModelVer">
                        <xml-root-element name="model-ver" />
                        <xml-properties>
                                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="SecondaryFilts">
                        <xml-properties>
                                <xml-property name="description" value="SecondaryFilts for performing a named-query or model query" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v11.SecondaryFilt" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="SecondaryFilt">
                        <xml-properties>
                                <xml-property name="description" value="SecondaryFilt for performing a named-query or model query" />
                                <xml-any-element java-attribute="propertyValue" lax="true" name="property-value" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="RouteTableReferences">
                        <xml-properties>
                                <xml-property name="description" value="Collection of openstack route table references" />
                                <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>
-
+               
                <java-type name="RouteTableReference">
                        <xml-root-element name="route-table-reference" />
                        <java-attributes>
                                </xml-element>
                                <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 route table reference." />
                                <xml-property name="nameProps" value="route-table-reference-fqdn" />
                                <xml-property name="namespace" value="network" />
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="InstanceGroups">
                        <xml-properties>
                                <xml-property name="description" value="Collection of openstack route table references" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v11.InstanceGroup" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="InstanceGroup">
                        <xml-root-element name="instance-group" />
                        <java-attributes>
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                        </java-attributes>
-
+                       
                        <xml-properties>
                                <xml-property name="description" value="General mechanism for grouping instances" />
                                <xml-property name="nameProps" value="description" />
                                <xml-property name="namespace" value="network" />
                        </xml-properties>
                </java-type>
-
+               
 
                <java-type name="SegmentationAssignments">
                        <xml-properties>
                                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v11.SegmentationAssignment" />
                        </java-attributes>
                </java-type>
-
+                               
                <java-type name="SegmentationAssignment">
                        <xml-root-element name="segmentation-assignment" />
                        <java-attributes>
                                <xml-property name="container" value="segmentation-assignments" />
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="AllottedResources">
                        <xml-properties>
                                <xml-property name="description" value="This object is used to store slices of services being offered" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v11.AllottedResource" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="AllottedResource">
                        <xml-root-element name="allotted-resource" />
                        <java-attributes>
                                                <xml-property name="description" value="Link back to more information in the controller" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                <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>
                                <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" />
                                <xml-property name="nameProps" value="description" />
                                <xml-property name="uniqueProps" value="id" />
-                               <xml-property name="indexedProps" value="id,persona-model-id,persona-model-version,type,role" />
+                               <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role" />
                                <xml-property name="dependentOn" value="service-instance" />
                                <xml-property name="container" value="allotted-resources" />
                                <!--  <xml-property name="namespace" value="network" /> -->
                        </xml-properties>
-               </java-type>
-
+               </java-type>    
+               
                <java-type name="TunnelXconnects">
                        <xml-properties>
                                <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v11.TunnelXconnect" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="TunnelXconnect">
                        <xml-root-element name="tunnel-xconnect" />
                        <java-attributes>
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                        </java-attributes>
-
+                       
                        <xml-properties>
                                <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted" />
                                <xml-property name="uniqueProps" value="id" />
                                <!--  <xml-property name="namespace" value="network" /> -->
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="Entitlements">
                        <xml-properties>
                                <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v11.Entitlement" />
                        </java-attributes>
                </java-type>
-
+                               
                <java-type name="Entitlement">
                        <xml-root-element name="entitlement" />
                        <java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Metadata for entitlement group." />
                                <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
-                               <xml-property name="dependentOn" value="generic-vnf,vce,vpe" />
+                               <xml-property name="dependentOn" value="generic-vnf,vce" />
                                <xml-property name="container" value="entitlements" />
                        </xml-properties>
                </java-type>
-
-
+               
+               
                <java-type name="Licenses">
                        <xml-properties>
                                <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v11.License" />
                        </java-attributes>
                </java-type>
-
+                               
                <java-type name="License">
                        <xml-root-element name="license" />
                        <java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Metadata for license group." />
                                <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
-                               <xml-property name="dependentOn" value="generic-vnf,vce,vpe" />
+                               <xml-property name="dependentOn" value="generic-vnf,vce" />
                                <xml-property name="container" value="licenses" />
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="Vnf">
                        <xml-root-element name="vnf"/>
                        <java-attributes>
                                <xml-property name="abstract" value="true" />
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="Zones">
                        <xml-properties>
                                <xml-property name="description" value="Collection of zones" />
                                <xml-property name="namespace" value="network" />
                        </xml-properties>
                </java-type>
-
+               <java-type name="TestObjects">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of VNFs" />
+                       </xml-properties>
+                       <xml-root-element name="test-objects" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList"
+                                       java-attribute="testObject" name="test-object"
+                                       type="inventory.aai.onap.org.v11.TestObject" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+               <java-type name="TestObject">
+                       <xml-root-element name="test-object" />
+                       <java-attributes>
+                               <xml-element java-attribute="vnfId" name="vnf-id"
+                                       required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Unique id of VNF.  This is unique across the graph." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfName" name="vnf-name"
+                                       required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfName2" name="vnf-name2"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Alternate name of VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfType" name="vnf-type"
+                                       required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceId" name="service-id"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Regional way of organizing pservers, source of truth should define values" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalState" name="operational-state"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="licenseKey" name="license-key"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="OBSOLETE -  do not use" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipmentRole" name="equipment-role"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Client should send valid enumerated value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Orchestration status of this VNF, used by MSO." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="heatStackId" name="heat-stack-id"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Heat stack id corresponding to this instance, managed by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="managementOption" name="management-option"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="identifier of managed by ATT or customer" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="v4 Loopback0 address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="v6 Loopback address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="managementV6Address" name="management-v6-address"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="v6 management address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vcpuUnits" name="vcpu-units"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vmemory" name="vmemory"
+                                       type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vmemoryUnits" name="vmemory-units"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vdisk" name="vdisk"
+                                       type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vdiskUnits" name="vdisk-units"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true"
+                                       java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false" />
+                                               <xml-property name="description"
+                                                       value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true"
+                                       java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled"
+                                       type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false" />
+                                               <xml-property name="description"
+                                                       value="used to indicate whether closed loop function is enabled on this node" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="summaryStatus" name="summary-status"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag"
+                                       type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="indicates whether generic-vnf access uses SSH" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="entitlementAssignmentGroupUuid"
+                                       name="entitlement-assignment-group-uuid" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="entitlementResourceUuid"
+                                       name="entitlement-resource-uuid" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="licenseAssignmentGroupUuid"
+                                       name="license-assignment-group-uuid" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="UUID of the license assignment group.  OBSOLETE -  See child relationships." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="UUID of the actual license resource.  OBSOLETE -  See child relationships." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelVer" name="persona-model-ver"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy"
+                                                       value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="notVisibleTestElement"
+                                       name="not-visible-test-element" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="visibility" value="internal" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="captures the id of all the configuration used to customize the resource for the service." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelId" name="widget-model-id"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelVersion" name="widget-model-version"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="asNumber" name="as-number"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="as-number of the VNF" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="regionalResourceSubzone"
+                                       name="regional-resource-subzone" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="represents sub zone of the rr plane" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nfType" name="nf-type"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="Generic description of the type of NF" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nfFunction" name="nf-function"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="English description of Network function that the specific VNF deployment is providing" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nfRole" name="nf-role"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="role in the network that this model will be providing" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nfNamingCode" name="nf-naming-code"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description"
+                                                       value="string assigned to this model used for naming purposes" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="selflink" name="selflink"
+                                       type="java.lang.String">
+                                       <xml-properties>
+                                               <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.onap.org.v11.TestObjects" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="General purpose VNF" />
+                               <xml-property name="nameProps" value="vnf-name" />
+                               <xml-property name="indexedProps"
+                                       value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role" />
+                               <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
+                               <xml-property name="uniqueProps" value="vnf-id" />
+                               <xml-property name="container" value="test-objects" />
+                               <xml-property name="namespace" value="network" />
+                               <xml-property name="extends" value="vnf" />
+                       </xml-properties>
+               </java-type>
        </java-types>
 </xml-bindings>