Sync up the changes between ecomp and onap

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

11 files changed, 27686 insertions, 26646 deletions

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd
index c783fe8f..b9c70964 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd
@@ -193,7 +193,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -259,7 +259,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -304,7 +304,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -441,7 +441,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -495,7 +495,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -573,7 +573,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -584,7 +584,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
+        <xs:element name="volume-group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
@@ -653,7 +653,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -698,7 +698,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -766,7 +766,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -834,7 +834,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-id",uniqueProps="vpn-id",dependentOn="l-interface",container="vlans")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -894,10 +894,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
+        <xs:element name="vpn-key" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan",dbAlias="vpn-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -932,7 +932,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1054,7 +1054,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1167,7 +1167,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1249,7 +1249,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1295,7 +1295,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1396,7 +1396,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1455,7 +1455,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1556,7 +1556,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1594,7 +1594,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1701,7 +1701,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1797,7 +1797,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1842,7 +1842,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1937,7 +1937,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2025,7 +2025,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2226,7 +2226,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2287,7 +2287,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2361,7 +2361,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2427,7 +2427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2529,7 +2529,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2674,7 +2674,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2720,7 +2720,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2786,7 +2786,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{att-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2852,7 +2852,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2911,7 +2911,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2956,7 +2956,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2986,7 +2986,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3016,7 +3016,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3050,7 +3050,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3112,7 +3112,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3168,7 +3168,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3214,7 +3214,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3246,7 +3246,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3275,7 +3275,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3308,7 +3308,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3362,7 +3362,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3519,7 +3519,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service",uriTemplate="/classes-of-service/class-of-service/{cos}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3571,7 +3571,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs",uriTemplate="/site-pairs/site-pair/{site-pair-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3613,7 +3613,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, etc.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -3645,7 +3645,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",uniqueProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",uniqueProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances",uriTemplate="/routing-instances/routing-instance/{routing-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3691,7 +3691,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3730,7 +3730,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3775,7 +3775,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3843,7 +3843,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3911,7 +3911,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network",uriTemplate="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3963,7 +3963,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3996,7 +3996,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4093,7 +4093,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4138,7 +4138,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4183,7 +4183,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4343,7 +4343,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation",searchable="vnfc-name",container="vnfcs",namespace="network",uriTemplate="/network/vnfcs/vnfc/{vnfc-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4357,14 +4357,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="vnfc-function-code" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="function code")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="function code",dbAlias="nfc-naming-code")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="vnfc-type" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="type")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="type",dbAlias="nfc-function")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -4437,7 +4437,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets",uriTemplate="/subnets/subnet/{subnet-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4540,7 +4540,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments",uriTemplate="/ctag-assignments/ctag-assignment/{vlan-id-inner}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4573,7 +4573,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4611,7 +4611,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4622,7 +4622,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
@@ -4821,7 +4821,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4868,7 +4868,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="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",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="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",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4997,7 +4997,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="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",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="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",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5008,7 +5008,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -5095,7 +5095,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="management-option" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed by company or customer")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5291,7 +5291,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="nf-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Generic description of the type of NF",suggestibleOnSearch="true")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Generic description of the type of NF")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5348,7 +5348,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5386,7 +5386,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5509,7 +5509,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5565,7 +5565,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="management-option" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed by company or customer")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5689,7 +5689,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5769,7 +5769,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5816,7 +5816,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5879,7 +5879,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5921,7 +5921,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5942,7 +5942,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="xauth-userid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="user ID for xAuth, sm-user, ,nmteHostName")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="user ID for xAuth, sm-user,nmteHostName")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5990,7 +5990,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6035,7 +6035,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6056,7 +6056,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="type" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability",dbAlias="instance-group-type")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6094,7 +6094,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6115,7 +6115,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="design-type" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Design of zone [Medium/Large?]")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Design of zone [Medium/Large…]")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6214,11 +6214,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/>
         <xs:element name="direction" type="xs:string" minOccurs="0"/>
         <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/>
-        <xs:element name="isParent" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="usesResource" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="hasDelTarget" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="SVC-INFRA" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="SVC-INFRA-REV" type="xs:boolean" minOccurs="0"/>
+        <xs:element name="contains-other-v" type="xs:string" minOccurs="0"/>
+        <xs:element name="delete-other-v" type="xs:string" minOccurs="0"/>
+        <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>
+        <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd
index 3e6d6dd4..edef5ed7 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd
@@ -193,7 +193,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -259,7 +259,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -304,7 +304,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -441,7 +441,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -495,7 +495,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -573,7 +573,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -584,7 +584,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
+        <xs:element name="volume-group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
@@ -653,7 +653,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -698,7 +698,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -766,7 +766,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -834,7 +834,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -946,7 +946,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1068,7 +1068,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1202,7 +1202,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1284,7 +1284,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1337,7 +1337,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1438,7 +1438,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1497,7 +1497,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1598,7 +1598,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1636,7 +1636,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1907,7 +1907,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1975,7 +1975,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2043,7 +2043,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2103,10 +2103,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="sriov-automation" type="xs:boolean" minOccurs="0">
+        <xs:element name="sriov-automation" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2163,7 +2163,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2208,7 +2208,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2246,7 +2246,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2356,7 +2356,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2444,7 +2444,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2659,7 +2659,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2879,7 +2879,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2953,7 +2953,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2964,28 +2964,28 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string">
+        <xs:element name="bandwidth-up-wan1" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN1")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string">
+        <xs:element name="bandwidth-down-wan1" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN1")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string">
+        <xs:element name="bandwidth-up-wan2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN2")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string">
+        <xs:element name="bandwidth-down-wan2" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN2")</annox:annotate>
@@ -3019,7 +3019,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3121,7 +3121,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3315,7 +3315,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3361,7 +3361,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3414,7 +3414,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3452,7 +3452,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id, owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id, owning-entity-name",container="owning-entities",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3497,7 +3497,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3535,7 +3535,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3590,7 +3590,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3656,7 +3656,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3715,7 +3715,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3760,7 +3760,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3790,7 +3790,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3820,7 +3820,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3854,7 +3854,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3916,7 +3916,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3972,7 +3972,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4018,7 +4018,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4050,7 +4050,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4079,7 +4079,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4112,7 +4112,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4166,7 +4166,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4330,7 +4330,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service",uriTemplate="/classes-of-service/class-of-service/{cos}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4382,7 +4382,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs",uriTemplate="/site-pairs/site-pair/{site-pair-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4456,7 +4456,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances",uriTemplate="/routing-instances/routing-instance/{routing-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4502,7 +4502,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4541,7 +4541,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4586,7 +4586,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4668,7 +4668,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4736,7 +4736,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network",uriTemplate="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4788,7 +4788,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4821,7 +4821,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4918,7 +4918,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4963,7 +4963,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5008,7 +5008,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5168,7 +5168,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network",uriTemplate="/network/vnfcs/vnfc/{vnfc-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5238,14 +5238,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5278,7 +5285,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes",uriTemplate="/host-routes/host-route/{host-route-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5332,7 +5339,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets",uriTemplate="/subnets/subnet/{subnet-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5457,7 +5464,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments",uriTemplate="/ctag-assignments/ctag-assignment/{vlan-id-inner}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5490,7 +5497,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5528,7 +5535,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5539,7 +5546,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
@@ -5738,7 +5745,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5785,7 +5792,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="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",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="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",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5914,7 +5921,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="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",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="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",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5932,7 +5939,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -6342,7 +6349,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6380,7 +6387,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6503,7 +6510,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6683,7 +6690,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6791,7 +6798,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6838,7 +6845,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7012,7 +7019,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7057,7 +7064,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7071,14 +7078,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model id for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model version uid for this resource model.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model version uid for this resource model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -7099,7 +7113,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="type" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability",dbAlias="instance-group-type")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -7137,7 +7151,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7203,7 +7217,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Port Mirror Configuration.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",nameProps="configuration-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Port Mirror Configuration.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7256,6 +7270,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
         <xs:element name="orchestration-status" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd
index b8c8a866..8dc219e2 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd
@@ -200,7 +200,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -266,7 +266,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -311,7 +311,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -448,7 +448,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -502,7 +502,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -580,7 +580,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -591,7 +591,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
+        <xs:element name="volume-group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
@@ -660,7 +660,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -705,7 +705,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -773,7 +773,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -841,7 +841,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -953,7 +953,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1075,7 +1075,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1209,7 +1209,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1291,7 +1291,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1437,7 +1437,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1451,7 +1451,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="flavor-name" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Cloud region Flavor name")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -1545,7 +1545,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1604,7 +1604,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1705,7 +1705,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1743,7 +1743,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1850,7 +1850,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1918,7 +1918,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2150,7 +2150,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2210,10 +2210,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="sriov-automation" type="xs:boolean" minOccurs="0">
+        <xs:element name="sriov-automation" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2277,7 +2277,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2322,7 +2322,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2360,7 +2360,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2477,7 +2477,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2565,7 +2565,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2780,7 +2780,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2825,7 +2825,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3074,7 +3074,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3148,7 +3148,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3214,7 +3214,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3316,7 +3316,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3510,7 +3510,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3556,7 +3556,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3609,7 +3609,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3647,7 +3647,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id, owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id, owning-entity-name",container="owning-entities",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3692,7 +3692,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3730,7 +3730,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3785,7 +3785,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3851,7 +3851,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3910,7 +3910,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3955,7 +3955,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3985,7 +3985,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4015,7 +4015,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4049,7 +4049,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4111,7 +4111,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4174,7 +4174,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4220,7 +4220,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4252,7 +4252,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4281,7 +4281,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4314,7 +4314,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4368,7 +4368,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4410,7 +4410,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="ip-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4, v6, or ds for dual stack")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4, v6, or ds for dual stack (should be att-ip-version)")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -4532,7 +4532,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service",uriTemplate="/classes-of-service/class-of-service/{cos}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4584,7 +4584,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs",uriTemplate="/site-pairs/site-pair/{site-pair-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4658,7 +4658,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances",uriTemplate="/routing-instances/routing-instance/{routing-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4704,7 +4704,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4743,7 +4743,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4788,7 +4788,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4870,7 +4870,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4938,7 +4938,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network",uriTemplate="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4990,7 +4990,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5023,7 +5023,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5120,7 +5120,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5165,7 +5165,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5210,7 +5210,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5370,7 +5370,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network",uriTemplate="/network/vnfcs/vnfc/{vnfc-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5440,14 +5440,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5480,7 +5487,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes",uriTemplate="/host-routes/host-route/{host-route-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5534,7 +5541,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets",uriTemplate="/subnets/subnet/{subnet-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5659,7 +5666,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments",uriTemplate="/ctag-assignments/ctag-assignment/{vlan-id-inner}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5692,7 +5699,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5730,7 +5737,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5741,7 +5748,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
@@ -5940,7 +5947,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5987,7 +5994,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="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",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="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",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6116,7 +6123,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="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",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="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",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6134,7 +6141,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -6544,7 +6551,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6582,7 +6589,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6705,7 +6712,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6892,7 +6899,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7000,7 +7007,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7047,7 +7054,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7221,7 +7228,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7266,7 +7273,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7280,14 +7287,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model id for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model version uid for this resource model.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ASDC model version uid for this resource model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -7308,7 +7322,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="type" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability",dbAlias="instance-group-type")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -7346,7 +7360,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7412,7 +7426,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7473,7 +7487,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7597,7 +7611,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Port Mirror Configuration.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",nameProps="configuration-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7650,28 +7664,35 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of the configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-status" type="xs:string">
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-selflink" type="xs:string">
+        <xs:element name="configuration-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details from SDN-GC.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-customization-id" type="xs:string">
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of  the configuration used to customize the resource")</annox:annotate>
@@ -7722,7 +7743,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7762,7 +7783,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7841,7 +7862,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7852,6 +7873,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>
         <xs:element name="aai-uri" type="xs:string" minOccurs="0"/>
+        <xs:element name="aai-uuid" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd
index e90f8da8..812672f2 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd
@@ -200,7 +200,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -266,7 +266,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -311,7 +311,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -448,7 +448,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -502,7 +502,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -580,7 +580,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -591,7 +591,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
+        <xs:element name="volume-group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
@@ -660,7 +660,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -705,7 +705,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -773,7 +773,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -841,7 +841,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -953,7 +953,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1075,7 +1075,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1209,7 +1209,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1291,7 +1291,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1437,7 +1437,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1451,7 +1451,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="flavor-name" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Cloud Region Flavor name")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -1545,7 +1545,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1604,7 +1604,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1705,7 +1705,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1743,7 +1743,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1850,7 +1850,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1918,7 +1918,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2150,7 +2150,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2210,10 +2210,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="sriov-automation" type="xs:boolean" minOccurs="0">
+        <xs:element name="sriov-automation" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2277,7 +2277,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2322,7 +2322,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2360,7 +2360,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2477,7 +2477,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2565,7 +2565,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2780,7 +2780,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2825,7 +2825,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3074,7 +3074,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3106,13 +3106,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
         <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -3148,7 +3141,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3214,7 +3207,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3253,13 +3246,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -3316,7 +3302,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3510,7 +3496,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3556,7 +3542,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3609,7 +3595,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3647,7 +3633,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id, owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id, owning-entity-name",container="owning-entities",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3692,7 +3678,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3730,7 +3716,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3785,7 +3771,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3851,7 +3837,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3910,7 +3896,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3955,7 +3941,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3985,7 +3971,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4015,7 +4001,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4049,7 +4035,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4111,7 +4097,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4174,7 +4160,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4220,7 +4206,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups",uriTemplate="/related-lookups/related-lookup/{related-lookup-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4252,7 +4238,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints",uriTemplate="/property-constraints/property-constraint/{property-constraint-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4281,7 +4267,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements",uriTemplate="/named-query-elements/named-query-element/{named-query-element-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4314,7 +4300,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/named-queries/named-query/{named-query-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4368,7 +4354,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4442,13 +4428,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
         <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -4532,7 +4511,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service",uriTemplate="/classes-of-service/class-of-service/{cos}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4584,7 +4563,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs",uriTemplate="/site-pairs/site-pair/{site-pair-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4658,7 +4637,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances",uriTemplate="/routing-instances/routing-instance/{routing-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4704,7 +4683,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4743,7 +4722,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4788,7 +4767,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4870,7 +4849,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4938,7 +4917,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network",uriTemplate="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4990,7 +4969,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5023,7 +5002,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5120,7 +5099,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5165,7 +5144,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5210,7 +5189,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5370,7 +5349,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network",uriTemplate="/network/vnfcs/vnfc/{vnfc-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5440,14 +5419,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5480,7 +5459,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes",uriTemplate="/host-routes/host-route/{host-route-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5534,7 +5513,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets",uriTemplate="/subnets/subnet/{subnet-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5659,7 +5638,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments",uriTemplate="/ctag-assignments/ctag-assignment/{vlan-id-inner}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5692,7 +5671,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5730,7 +5709,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5741,7 +5720,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
@@ -5940,7 +5919,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5987,7 +5966,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="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",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="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",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6026,6 +6005,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="automated-assignment" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Indicates whether vf-module assignment was done via automation or manually")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -6116,7 +6102,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="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",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="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",searchable="vnf-id,vnf-name,vnf-name2,operational-status",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6134,7 +6120,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -6179,7 +6165,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="operational-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6544,7 +6530,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6582,7 +6568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6705,7 +6691,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6870,6 +6856,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The ASDC model id for this resource  model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The ASDC model version for this resource  model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
         <xs:element ref="tns:p-interfaces" minOccurs="0"/>
         <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
@@ -6892,7 +6892,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7000,7 +7000,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7047,7 +7047,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7221,7 +7221,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7266,7 +7266,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7353,7 +7353,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7419,7 +7419,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7480,7 +7480,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7604,7 +7604,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Port Mirror Configuration.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",nameProps="configuration-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7636,7 +7636,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-sub-type" type="xs:string">
+        <xs:element name="configuration-sub-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vprobe, pprobe.")</annox:annotate>
@@ -7657,28 +7657,28 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of the configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-status" type="xs:string">
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-selflink" type="xs:string">
+        <xs:element name="configuration-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details from SDN-GC.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-customization-id" type="xs:string">
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of  the configuration used to customize the resource")</annox:annotate>
@@ -7729,7 +7729,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7769,7 +7769,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7817,7 +7817,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",description="represents the collection resource in the TOSCA model",uniqueProps="collection-id",indexedProps="collection-id,model-invariant-id,model-version-id",container="collections")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",description="represents the collection resource in the TOSCA model",uniqueProps="collection-id",indexedProps="collection-id,model-invariant-id,model-version-id",container="collections",uriTemplate="/network/collections/collection/{collection-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7938,7 +7938,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7949,6 +7949,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>
         <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>
         <xs:element name="aai-uri" type="xs:string" minOccurs="0"/>
+        <xs:element name="aai-uuid" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -7967,6 +7968,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="delete-other-v" type="xs:string" minOccurs="0"/>
         <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>
         <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/>
+        <xs:element name="private" type="xs:boolean" minOccurs="0"/>
         <xs:element name="aai-uuid" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
index 1d1ff724..c7c5eee1 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
@@ -200,7 +200,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks",uriTemplate="/oam-networks/oam-network/{network-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -266,7 +266,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches",uriTemplate="/dvs-switches/dvs-switch/{switch-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -311,7 +311,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones",uriTemplate="/availability-zones/availability-zone/{availability-zone-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -448,7 +448,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools",uriTemplate="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -502,7 +502,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/complexes/complex/{physical-location-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -580,7 +580,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups",uriTemplate="/volume-groups/volume-group/{volume-group-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -591,7 +591,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
+        <xs:element name="volume-group-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
@@ -660,7 +660,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes",uriTemplate="/volumes/volume/{volume-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -705,7 +705,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc,cp",uriTemplate="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -773,7 +773,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface,vnfc,cp",uriTemplate="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -841,7 +841,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -936,6 +936,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="is-private" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Private VLAN indicator.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
         <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>
         <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>
@@ -953,7 +960,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs",uriTemplate="/sriov-vfs/sriov-vf/{pci-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1075,7 +1082,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface",container="l-interfaces",uriTemplate="/l-interfaces/l-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1190,6 +1197,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
         <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>
         <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>
+        <xs:element name="admin-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Administrative status of the interface. Valid values are 'up', 'down', or 'testing'.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -1209,7 +1223,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1287,11 +1301,84 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="nos-server">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="nos-server is the execution environment that will have images, certain versions of VNOS, running on it.",indexedProps="nos-server-id",dependentOn="tenant",nameProps="nos-server-name",container="nos-servers",uriTemplate="/nos-servers/nos-server/{nos-server-id}")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="nos-server-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier for this nos relative to its tenant")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="nos-server-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of nos")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vendor" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="uCPE vendor")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="nos-server-selflink" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="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.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="nos-servers">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="nos-server is the execution environment that will have images, certain versions of VNOS, running on it.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:nos-server" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="tenant">
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants",uriTemplate="/tenants/tenant/{tenant-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1324,6 +1411,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
           </xs:annotation>
         </xs:element>
         <xs:element ref="tns:vservers" minOccurs="0"/>
+        <xs:element ref="tns:nos-servers" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
@@ -1437,7 +1525,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors",uriTemplate="/flavors/flavor/{flavor-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1545,7 +1633,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments",uriTemplate="/group-assignments/group-assignment/{group-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1604,7 +1692,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots",uriTemplate="/snapshots/snapshot/{snapshot-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1705,7 +1793,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata",uriTemplate="/metadata/metadatum/{metaname}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1743,7 +1831,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images",uriTemplate="/images/image/{image-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1850,7 +1938,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv4-address-list/{vip-ipv4-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1918,7 +2006,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="cloud-region",uriTemplate="/vip-ipv6-address-list/{vip-ipv6-address}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2150,7 +2238,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2210,10 +2298,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="sriov-automation" type="xs:boolean" minOccurs="0">
+        <xs:element name="sriov-automation" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2270,7 +2358,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2315,7 +2403,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs",uriTemplate="/sriov-pfs/sriov-pf/{pf-pci-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2353,7 +2441,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2491,7 +2579,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces",uriTemplate="/lag-interfaces/lag-interface/{interface-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2579,7 +2667,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2794,7 +2882,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2839,7 +2927,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2908,6 +2996,51 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="network-technology">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="The network-technology object is used to capture the supported network technologies of a cloud-region.",nameProps="network-technology-id,network-technology-name",uniqueProps="network-technology-id",container="network-technologies",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="network-technology-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier of the network-technology object (UUID)")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="network-technology-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The network-technology  that a cloud-region can support. Current valid values- CONTRAIL AIC_SR_IOV OVS STANDARD-SR-IOV")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="network-technologies">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:network-technology" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="cloud-infrastructure">
     <xs:complexType>
       <xs:annotation>
@@ -2922,6 +3055,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element ref="tns:pservers" minOccurs="0"/>
         <xs:element ref="tns:virtual-data-centers" minOccurs="0"/>
         <xs:element ref="tns:operational-environments" minOccurs="0"/>
+        <xs:element ref="tns:network-technologies" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -3088,7 +3222,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business",uriTemplate="/business/connectors/connector/{resource-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3120,13 +3254,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
         <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -3162,7 +3289,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3173,34 +3300,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN1")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN1")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -3228,7 +3327,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description,allotted-resource-name",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description,allotted-resource-name",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name",dependentOn="service-instance",container="allotted-resources",uriTemplate="/allotted-resources/allotted-resource/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3267,13 +3366,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -3386,7 +3478,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances",uriTemplate="/service-instances/service-instance/{service-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3495,34 +3587,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
         <xs:element name="vhn-portal-url" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -3587,7 +3651,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type",uriTemplate="/service-subscriptions/service-subscription/{service-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3633,7 +3697,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business",uriTemplate="/business/customers/customer/{global-customer-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3686,7 +3750,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a line-of-business",indexedProps="line-of-business-name",uniqueProps="line-of-business-name",container="lines-of-business",namespace="business",uriTemplate="/business/lines-of-business/line-of-business/{line-of-business-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3724,7 +3788,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id, owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id, owning-entity-name",container="owning-entities",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes an owning-entity",indexedProps="owning-entity-id,owning-entity-name",searchable="owning-entity-id",uniqueProps="owning-entity-id,owning-entity-name",container="owning-entities",namespace="business",uriTemplate="/business/owning-entities/owning-entity/{owning-entity-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3769,7 +3833,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes a platform",indexedProps="platform-name",uniqueProps="platform-name",container="platforms",namespace="business",uriTemplate="/business/platforms/platform/{platform-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3807,7 +3871,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="describes the project",indexedProps="project-name",uniqueProps="project-name",container="projects",namespace="business",uriTemplate="/business/projects/project/{project-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3845,7 +3909,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3908,7 +3972,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3974,7 +4038,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/services/service/{service-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4033,7 +4097,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4078,7 +4142,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets",uriTemplate="/element-choice-sets/element-choice-set/{element-choice-set-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4108,7 +4172,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4138,7 +4202,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4172,7 +4236,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4234,7 +4298,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers",uriTemplate="/model-vers/model-ver/{model-version-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4297,7 +4361,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation",uriTemplate="/service-design-and-creation/models/model/{model-invariant-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4491,7 +4555,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4565,13 +4629,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
         <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -4655,7 +4712,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service",uriTemplate="/classes-of-service/class-of-service/{cos}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4707,7 +4764,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs",uriTemplate="/site-pairs/site-pair/{site-pair-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4781,7 +4838,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances",uriTemplate="/routing-instances/routing-instance/{routing-instance-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4827,7 +4884,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network",uriTemplate="/network/site-pair-sets/site-pair-set/{site-pair-set-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4866,7 +4923,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true",uriTemplate="/route-targets/route-target/{global-route-target}/{route-target-role}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -4911,7 +4968,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5070,7 +5127,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network",uriTemplate="/network/vpls-pes/vpls-pe/{equipment-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5138,7 +5195,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network",uriTemplate="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5190,7 +5247,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5223,7 +5280,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5320,7 +5377,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5365,7 +5422,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements",uriTemplate="/entitlements/entitlement/{group-uuid}/{resource-uuid}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5410,7 +5467,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5566,11 +5623,58 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="cp">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="point of attachment from services or resources to a virtual link or network.",uniqueProps="cp-instance-id",dependentOn="vnfc",container="cps",uriTemplate="/cps/cp/{cp-instance-id}")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="cp-instance-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the connection point.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="port-id" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="port index to represent multiple CPs on VNFC connected to same network.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>
+        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="cps">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of connection points.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:cp" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="vnfc">
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network",uriTemplate="/network/vnfcs/vnfc/{vnfc-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5647,7 +5751,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5659,6 +5770,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
           </xs:annotation>
         </xs:element>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element ref="tns:cps" minOccurs="0"/>
         <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="5000"/>
         <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="5000"/>
       </xs:sequence>
@@ -5680,7 +5792,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes",uriTemplate="/host-routes/host-route/{host-route-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5734,7 +5846,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets",uriTemplate="/subnets/subnet/{subnet-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5859,7 +5971,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments",uriTemplate="/ctag-assignments/ctag-assignment/{vlan-id-inner}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5892,7 +6004,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments",uriTemplate="/segmentation-assignments/segmentation-assignment/{segmentation-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5930,7 +6042,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -5941,7 +6053,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="network-name" type="xs:string">
+        <xs:element name="network-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
@@ -6116,6 +6228,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="is-trunked" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Trunked network indication.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
         <xs:element ref="tns:subnets" minOccurs="0"/>
         <xs:element ref="tns:ctag-assignments" minOccurs="0"/>
         <xs:element ref="tns:segmentation-assignments" minOccurs="0"/>
@@ -6140,7 +6259,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6187,7 +6306,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="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",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="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",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules",uriTemplate="/vf-modules/vf-module/{vf-module-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6226,6 +6345,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="automated-assignment" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Indicates whether vf-module assignment was done via automation or manually")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -6316,7 +6442,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="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",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="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",searchable="vnf-id,vnf-name,vnf-name2,operational-status",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6334,7 +6460,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
+        <xs:element name="vnf-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
@@ -6379,7 +6505,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="operational-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6744,7 +6870,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network",uriTemplate="/network/lag-links/lag-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6782,7 +6908,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network",uriTemplate="/network/newvces/newvce/{vnf-id2}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -6905,7 +7031,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7127,7 +7253,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7235,7 +7361,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers",uriTemplate="/vig-servers/vig-server/{vig-address-type}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7282,7 +7408,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network",uriTemplate="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7456,7 +7582,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network",uriTemplate="/network/route-table-references/route-table-reference/{route-table-reference-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7501,7 +7627,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7588,7 +7714,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7650,11 +7776,71 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="vlan-mapping">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="vlan-mapping object is an optional child object of the forwarder-evc object.  A given forwarder-evc object may have multiple vlan-mapping objects.",dependentOn="forwarder-evc",uniqueProps="vlan-mapping-id",container="vlan-mappings",uriTemplate="/vlan-mappings/vlan-mapping/{vlan-mapping-id}")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vlan-mapping-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Key for vlan-mapping object.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="uni-cvlan" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CVLAN value from the UNI/ingress side of the SAREA gateway access device.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="nni-svlan" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="SVLAN value from the NNI/egress side of the SAREA gateway access device.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="nni-cvlan" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="CVLAN value from the NNI/egress side of the SAREA gateway access device.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ivlan" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The internal VLAN ('IVLAN') value.  Specific to Arista devices.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vlan-mappings">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of vlan mappings.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:vlan-mapping" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="forwarder-evc">
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="forwarder object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="forwarder-evc-id",container="forwarder-evcs",uriTemplate="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7693,6 +7879,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element ref="tns:vlan-mappings" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
@@ -7715,7 +7902,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="evc object is an optional child object of the Configuration object.",dependentOn="configuration",uniqueProps="evc-id",container="evcs",uriTemplate="/evcs/evc/{evc-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7839,7 +8026,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Port Mirror Configuration.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",nameProps="configuration-type")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic configuration object.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network",uriTemplate="/network/configurations/configuration/{configuration-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -7871,7 +8058,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-sub-type" type="xs:string">
+        <xs:element name="configuration-sub-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vprobe, pprobe.")</annox:annotate>
@@ -7892,28 +8079,28 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration status of the configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-status" type="xs:string">
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-selflink" type="xs:string">
+        <xs:element name="configuration-selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details from SDN-GC.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-customization-id" type="xs:string">
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
               <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of  the configuration used to customize the resource")</annox:annotate>
@@ -7934,6 +8121,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="config-policy-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to capture the name of the fabric configuration policy that was used to generate the payload sent to PINC for fabric configuration.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -7964,7 +8158,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(indexedProps="sequence",description="Entity describing a sequenced segment of forwarding path",container="forwarders",dependentOn="forwarding-path",uriTemplate="/forwarders/forwarder/{sequence}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -8004,7 +8198,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",indexedProps="forwarding-path-id,forwarding-path-name",description="Entity that describes the sequenced forwarding path between interfaces of services or resources",container="forwarding-paths",nameProps="forwarding-path-name",uniqueProps="forwarding-path-id",uriTemplate="/network/forwarding-paths/forwarding-path/{forwarding-path-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -8052,7 +8246,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",description="represents the collection resource in the TOSCA model",uniqueProps="collection-id",indexedProps="collection-id,model-invariant-id,model-version-id",container="collections")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",description="represents the collection resource in the TOSCA model",uniqueProps="collection-id",indexedProps="collection-id,model-invariant-id,model-version-id",container="collections",uriTemplate="/network/collections/collection/{collection-id}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -8137,6 +8331,67 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="vlan-tag">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vlan-tag-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vlan-tag-role" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vlan-id-inner" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN inner id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vlan-id-outer" type="xs:int">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN outer id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="is-private" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vlan-tags">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:vlan-tag" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="network">
     <xs:complexType>
       <xs:annotation>
@@ -8166,6 +8421,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element ref="tns:configurations" minOccurs="0"/>
         <xs:element ref="tns:forwarding-paths" minOccurs="0"/>
         <xs:element ref="tns:collections" minOccurs="0"/>
+        <xs:element ref="tns:vlan-tags" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
index 2e65669b..5a4eddb2 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
@@ -2835,11 +2835,11 @@
 		{
 			"from": "l3-interface-ipv4-address-list",
 			"to": "cp",
-			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"label": "org.onap.relationships.inventory.network.BelongsTo",
 			"direction": "OUT",
 			"multiplicity": "MANY2ONE",
 			"contains-other-v": "!${direction}",
-			"delete-other-v": "NONE",
+			"delete-other-v": "!${direction}",
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":""
@@ -2847,11 +2847,11 @@
 		{
 			"from": "l3-interface-ipv6-address-list",
 			"to": "cp",
-			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"label": "org.onap.relationships.inventory.network.BelongsTo",
 			"direction": "OUT",
 			"multiplicity": "MANY2ONE",
 			"contains-other-v": "!${direction}",
-			"delete-other-v": "NONE",
+			"delete-other-v": "!${direction}",
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":""
@@ -2859,10 +2859,10 @@
 		{
 			"from": "vip-ipv4-address-list",
 			"to": "cp",
-			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"label": "org.onap.relationships.inventory.network.Uses",
 			"direction": "OUT",
-			"multiplicity": "MANY2ONE",
-			"contains-other-v": "!${direction}",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true",
@@ -2871,10 +2871,10 @@
 		{
 			"from": "vip-ipv6-address-list",
 			"to": "cp",
-			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"label": "org.onap.relationships.inventory.network.Uses",
 			"direction": "OUT",
-			"multiplicity": "MANY2ONE",
-			"contains-other-v": "!${direction}",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true",
@@ -2909,7 +2909,7 @@
 			"to": "cp",
 			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "MANY2ONE",
+			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"prevent-delete": "NONE",
@@ -2978,7 +2978,43 @@
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "instance-group",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+			{
+			"from": "cloud-region",
+			"to": "network-technology",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
 		}
-	
+		
 	]
 }
diff --git a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml
index f3a94c42..e22bd094 100644
--- a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml
@@ -24,236 +24,236 @@
 -->
 <xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true">
     <xml-schema element-form-default="QUALIFIED">
-        <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v10" />
+        <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v10"/>
     </xml-schema>
     <java-types>
         <java-type name="Inventory">
-            <xml-root-element name="inventory" />
-            <java-attributes>
-                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v10.Search" />
-                <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v10.Actions" />
-                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v10.CloudInfrastructure" />
-                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v10.Business" />
-                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v10.ServiceDesignAndCreation" />
-                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v10.Network" />
-                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v10.AaiInternal" />
+            <xml-root-element name="inventory"/>
+            <java-attributes>
+                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v10.Search"/>
+                <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v10.Actions"/>
+                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v10.CloudInfrastructure"/>
+                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v10.Business"/>
+                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v10.ServiceDesignAndCreation"/>
+                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v10.Network"/>
+                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v10.AaiInternal"/>
                 <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v10.Nodes"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Nodes">
-            <xml-root-element name="nodes" />
+            <xml-root-element name="nodes"/>
         </java-type>
         <java-type name="Search">
-            <xml-root-element name="search" />
+            <xml-root-element name="search"/>
             <java-attributes>
-                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v10.EdgeTagQueryResult" />
-                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v10.EdgeTagQueryRequest" />
-                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v10.SearchResults" />
-                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v10.SdnZoneResponse" />
+                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v10.EdgeTagQueryResult"/>
+                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v10.EdgeTagQueryRequest"/>
+                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v10.SearchResults"/>
+                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v10.SdnZoneResponse"/>
             </java-attributes>
         </java-type>
 
         <java-type name="EdgeTagQueryResult">
-            <xml-root-element name="edge-tag-query-result" />
+            <xml-root-element name="edge-tag-query-result"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v10.TaggedInventoryItemList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v10.TaggedInventoryItemList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="TaggedInventoryItemList">
-            <xml-root-element name="tagged-inventory-item-list" />
+            <xml-root-element name="tagged-inventory-item-list"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v10.InventoryItem" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v10.InventoryItem"/>
             </java-attributes>
         </java-type>
 
         <java-type name="InventoryItem">
-            <xml-root-element name="inventory-item" />
+            <xml-root-element name="inventory-item"/>
             <java-attributes>
-                <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" />
-                <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v10.InventoryItemData" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v10.TaggedInventoryItemList" />
+                <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String"/>
+                <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v10.InventoryItemData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v10.TaggedInventoryItemList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="InventoryItemData">
-            <xml-root-element name="inventory-item-data" />
+            <xml-root-element name="inventory-item-data"/>
             <java-attributes>
-                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="EdgeTagQueryRequest">
-            <xml-root-element name="edge-tag-query-request" />
+            <xml-root-element name="edge-tag-query-request"/>
             <java-attributes>
-                <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" />
-                <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" />
-                <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v10.StartNodeFilter" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v10.IncludeNodeFilter" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v10.SecondaryFilter" />
+                <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String"/>
+                <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String"/>
+                <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v10.StartNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v10.IncludeNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v10.SecondaryFilter"/>
             </java-attributes>
         </java-type>
 
         <java-type name="StartNodeFilter">
-            <xml-root-element name="start-node-filter" />
+            <xml-root-element name="start-node-filter"/>
             <java-attributes>
-                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="IncludeNodeFilter">
-            <xml-root-element name="include-node-filter" />
+            <xml-root-element name="include-node-filter"/>
             <java-attributes>
-                <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String" />
+                <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="SecondaryFilter">
-            <xml-root-element name="secondary-filter" />
+            <xml-root-element name="secondary-filter"/>
             <java-attributes>
-                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-                <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String" />
-                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="SearchResults">
-            <xml-root-element name="search-results" />
+            <xml-root-element name="search-results"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v10.ResultData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v10.ResultData"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ResultData">
-            <xml-root-element name="result-data" />
+            <xml-root-element name="result-data"/>
             <java-attributes>
                 <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The specific type of node in the A&amp;AI graph" />
+                        <xml-property name="description" value="The specific type of node in the A&amp;AI graph"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The URL to the specific resource" />
+                        <xml-property name="description" value="The URL to the specific resource"/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
         </java-type>
 
         <java-type name="SdnZoneResponse">
-            <xml-root-element name="sdn-zone-response" />
+            <xml-root-element name="sdn-zone-response"/>
             <java-attributes>
-                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v10.OamNetworks" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v10.AzAndDvsSwitches" />
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v10.OamNetworks"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v10.AzAndDvsSwitches"/>
             </java-attributes>
         </java-type>
 
         <java-type name="AzAndDvsSwitches">
-            <xml-root-element name="az-and-dvs-switches" />
+            <xml-root-element name="az-and-dvs-switches"/>
             <java-attributes>
-                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v10.DvsSwitches" />
-                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v10.AvailabilityZone" />
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v10.DvsSwitches"/>
+                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v10.AvailabilityZone"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Actions">
             <xml-properties>
-                <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)." />
+                <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)."/>
             </xml-properties>
-            <xml-root-element name="actions" />
+            <xml-root-element name="actions"/>
             <java-attributes>
-                <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v10.Update" />
-                <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v10.Notify" />
+                <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v10.Update"/>
+                <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v10.Notify"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Update">
             <xml-properties>
-                <xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team." />
+                <xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team."/>
             </xml-properties>
-            <xml-root-element name="update" />
+            <xml-root-element name="update"/>
             <java-attributes>
-                <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v10.UpdateNodeKey" />
-                <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v10.Action" />
+                <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v10.UpdateNodeKey"/>
+                <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v10.Action"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Action">
-            <xml-root-element name="action" />
+            <xml-root-element name="action"/>
             <java-attributes>
-                <xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v10.ActionData" />
+                <xml-element java-attribute="actionType" name="action-type" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v10.ActionData"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ActionData">
-            <xml-root-element name="action-data" />
+            <xml-root-element name="action-data"/>
             <java-attributes>
-                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="UpdateNodeKey">
-            <xml-root-element name="update-node-key" />
+            <xml-root-element name="update-node-key"/>
             <java-attributes>
-                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
-                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
+                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Notify">
-            <xml-root-element name="notify" />
+            <xml-root-element name="notify"/>
             <java-attributes>
-                <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" />
-                <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" />
-                <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v10.KeyData" />
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
+                <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String"/>
+                <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v10.KeyData"/>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="KeyData">
-            <xml-root-element name="key-data" />
+            <xml-root-element name="key-data"/>
             <java-attributes>
-                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
-                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
+                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="CloudInfrastructure">
             <xml-properties>
-                <xml-property name="description" value="Namespace for cloud infrastructure." />
+                <xml-property name="description" value="Namespace for cloud infrastructure."/>
             </xml-properties>
-            <xml-root-element name="cloud-infrastructure" />
+            <xml-root-element name="cloud-infrastructure"/>
             <java-attributes>
-                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v10.Complexes" />
-                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v10.CloudRegions" />
-                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v10.NetworkProfiles" />
-                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v10.Pservers" />
-                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v10.VirtualDataCenters" />
+                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v10.Complexes"/>
+                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v10.CloudRegions"/>
+                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v10.NetworkProfiles"/>
+                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v10.Pservers"/>
+                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v10.VirtualDataCenters"/>
             </java-attributes>
         </java-type>
 
         <java-type name="CloudRegions">
-            <xml-root-element name="cloud-regions" />
+            <xml-root-element name="cloud-regions"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v10.CloudRegion" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v10.CloudRegion"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="CloudRegion">
-            <xml-root-element name="cloud-region" />
+            <xml-root-element name="cloud-region"/>
             <java-attributes>
                 <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
@@ -262,179 +262,181 @@
                 </xml-element>
                 <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" />
+                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the cloud (e.g., openstack)" />
+                        <xml-property name="description" value="Type of the cloud (e.g., openstack)"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)" />
+                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE." />
+                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL of the keystone identity service" />
+                        <xml-property name="description" value="URL of the keystone identity service"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
+                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
+                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
                     </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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v10.VolumeGroups" />
-                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v10.Tenants" />
-                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v10.Flavors" />
-                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v10.GroupAssignments" />
-                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v10.Snapshots" />
-                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v10.Images" />
-                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v10.DvsSwitches" />
-                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v10.OamNetworks" />
-                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v10.AvailabilityZones" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v10.VolumeGroups"/>
+                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v10.Tenants"/>
+                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v10.Flavors"/>
+                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v10.GroupAssignments"/>
+                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v10.Snapshots"/>
+                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v10.Images"/>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v10.DvsSwitches"/>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v10.OamNetworks"/>
+                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v10.AvailabilityZones"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation" />
-                <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="namespace" value="cloud-infrastructure" />
+                <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="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}"/>
             </xml-properties>
         </java-type>
         <java-type name="VolumeGroups">
             <xml-properties>
-                <xml-property name="description" value="Collection of persistent block-level storage." />
+                <xml-property name="description" value="Collection of persistent block-level storage."/>
             </xml-properties>
-            <xml-root-element name="volume-groups" />
+            <xml-root-element name="volume-groups"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v10.VolumeGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v10.VolumeGroup"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VolumeGroup">
-            <xml-root-element name="volume-group" />
+            <xml-root-element name="volume-group"/>
             <java-attributes>
                 <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of volume-group." />
+                        <xml-property name="description" value="Unique ID of volume-group."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="volumeGroupName" name="volume-group-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the volume group." />
+                        <xml-property name="description" value="Name of the volume group."/>
                     </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 volume-group" />
+                        <xml-property name="description" value="Heat stack id corresponding to this volume-group"/>
                     </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-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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this volume-group" />
+                        <xml-property name="description" value="Orchestration status of this volume-group"/>
                     </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-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-properties>
-                        <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group" />
+                        <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Persistent block-level storage." />
-                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" />
-                <xml-property name="searchable" value="volume-group-id,volume-group-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="volume-groups" />
+                <xml-property name="description" value="Persistent block-level storage."/>
+                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id"/>
+                <xml-property name="searchable" value="volume-group-id,volume-group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="volume-groups"/>
+                <xml-property name="uriTemplate" value="/volume-groups/volume-group/{volume-group-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="RelationshipList">
-            <xml-root-element name="relationship-list" />
+            <xml-root-element name="relationship-list"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v10.Relationship" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v10.Relationship"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Relationship">
-            <xml-root-element name="relationship" />
+            <xml-root-element name="relationship"/>
             <java-attributes>
                 <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node." />
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to the object in A&amp;AI." />
+                        <xml-property name="description" value="URL to the object in A&amp;AI."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v10.RelationshipData" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v10.RelatedToProperty" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v10.RelationshipData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v10.RelatedToProperty"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RelatedToProperty">
-            <xml-root-element name="related-to-property" />
+            <xml-root-element name="related-to-property"/>
             <java-attributes>
                 <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Key part of a key/value pair" />
+                        <xml-property name="description" value="Key part of a key/value pair"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Value part of a key/value pair" />
+                        <xml-property name="description" value="Value part of a key/value pair"/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
         </java-type>
 
         <java-type name="RelationshipData">
-            <xml-root-element name="relationship-data" />
+            <xml-root-element name="relationship-data"/>
             <java-attributes>
                 <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute." />
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Value of the attribute." />
+                        <xml-property name="description" value="Value of the attribute."/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
@@ -442,1970 +444,1997 @@
 
         <java-type name="Complexes">
             <xml-properties>
-                <xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
             </xml-properties>
-            <xml-root-element name="complexes" />
+            <xml-root-element name="complexes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v10.Complex" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v10.Complex"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Complex">
-            <xml-root-element name="complex" />
+            <xml-root-element name="complex"/>
             <java-attributes>
                 <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" />
+                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex" />
+                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Gamma complex name for LCP instance." />
+                        <xml-property name="description" value="Gamma complex name for LCP instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL of the keystone identity service" />
+                        <xml-property name="description" value="URL of the keystone identity service"/>
                     </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-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="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type, e.g., central office, data center." />
+                        <xml-property name="description" value="Type, e.g., central office, data center."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" />
-                <xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-                <xml-element java-attribute="state" name="state" type="java.lang.String" />
-                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String" />
-                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String" />
-                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
-                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
-                <xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v10.CtagPools" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="street2" name="street2" type="java.lang.String"/>
+                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="state" name="state" type="java.lang.String"/>
+                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"/>
+                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"/>
+                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"/>
+                <xml-element java-attribute="lata" name="lata" type="java.lang.String"/>
+                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v10.CtagPools"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id" />
-                <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code" />
-                <xml-property name="uniqueProps" value="physical-location-id" />
-                <xml-property name="container" value="complexes" />
-                <xml-property name="namespace" value="cloud-infrastructure" />
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id"/>
+                <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code"/>
+                <xml-property name="uniqueProps" value="physical-location-id"/>
+                <xml-property name="container" value="complexes"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/complexes/complex/{physical-location-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="CtagPools">
-            <xml-root-element name="ctag-pools" />
+            <xml-root-element name="ctag-pools"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v10.CtagPool" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v10.CtagPool"/>
             </java-attributes>
         </java-type>
 
         <java-type name="CtagPool">
-            <xml-root-element name="ctag-pool" />
+            <xml-root-element name="ctag-pool"/>
             <java-attributes>
                 <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="The Target provider edge router" />
+                        <xml-property name="description" value="The Target provider edge router"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the availability zone" />
+                        <xml-property name="description" value="Name of the availability zone"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Describes what the intended purpose of this pool is." />
+                        <xml-property name="description" value="Describes what the intended purpose of this pool is."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Comma separated list of ctags" />
+                        <xml-property name="description" value="Comma separated list of ctags"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
-                <xml-property name="indexedProps" value="availability-zone-name" />
-                <xml-property name="dependentOn" value="complex" />
-                <xml-property name="container" value="ctag-pools" />
+                <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose."/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="ctag-pools"/>
+                <xml-property name="uriTemplate" value="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Tenants">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack tenants." />
+                <xml-property name="description" value="Collection of openstack tenants."/>
             </xml-properties>
-            <xml-root-element name="tenants" />
+            <xml-root-element name="tenants"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v10.Tenant" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v10.Tenant"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Tenant">
-            <xml-root-element name="tenant" />
+            <xml-root-element name="tenant"/>
             <java-attributes>
                 <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id relative to the cloud-region." />
+                        <xml-property name="description" value="Unique id relative to the cloud-region."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Readable name of tenant" />
+                        <xml-property name="description" value="Readable name of tenant"/>
                     </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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v10.Vservers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v10.Vservers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack tenant" />
-                <xml-property name="nameProps" value="tenant-name" />
-                <xml-property name="indexedProps" value="tenant-name,tenant-id" />
-                <xml-property name="searchable" value="tenant-id,tenant-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="tenants" />
+                <xml-property name="description" value="Openstack tenant"/>
+                <xml-property name="nameProps" value="tenant-name"/>
+                <xml-property name="indexedProps" value="tenant-name,tenant-id"/>
+                <xml-property name="searchable" value="tenant-id,tenant-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="tenants"/>
+                <xml-property name="uriTemplate" value="/tenants/tenant/{tenant-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Vservers">
             <xml-properties>
-                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." />
+                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs."/>
             </xml-properties>
-            <xml-root-element name="vservers" />
+            <xml-root-element name="vservers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v10.Vserver" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v10.Vserver"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Vserver">
-            <xml-root-element name="vserver" />
+            <xml-root-element name="vserver"/>
             <java-attributes>
                 <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant" />
+                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of vserver" />
+                        <xml-property name="description" value="Name of vserver"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alternative name of vserver" />
+                        <xml-property name="description" value="Alternative name of vserver"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                <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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                        <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-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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-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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v10.Volumes" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
+                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v10.Volumes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
-                <xml-property name="nameProps" value="vserver-name" />
-                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" />
-                <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2" />
-                <xml-property name="dependentOn" value="tenant" />
-                <xml-property name="container" value="vservers" />
+                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
+                <xml-property name="nameProps" value="vserver-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2"/>
+                <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="container" value="vservers"/>
+                <xml-property name="uriTemplate" value="/vservers/vserver/{vserver-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="LInterfaces">
             <xml-properties>
-                <xml-property name="description" value="Collection of logical interfaces." />
+                <xml-property name="description" value="Collection of logical interfaces."/>
             </xml-properties>
-            <xml-root-element name="l-interfaces" />
+            <xml-root-element name="l-interfaces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v10.LInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v10.LInterface"/>
             </java-attributes>
         </java-type>
 
         <java-type name="LInterface">
-            <xml-root-element name="l-interface" />
+            <xml-root-element name="l-interface"/>
             <java-attributes>
                 <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name given to the interface" />
+                        <xml-property name="description" value="Name given to the interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
+                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
+                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of interface" />
+                        <xml-property name="description" value="ID of interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="MAC address for the interface" />
+                        <xml-property name="description" value="MAC address for the interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the network" />
+                        <xml-property name="description" value="Name of the network"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER" />
+                        <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 java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Human friendly text regarding this interface." />
+                        <xml-property name="description" value="Human friendly text regarding this interface."/>
                     </xml-properties>
                 </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-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-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-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.v10.Vlans" />
-                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v10.SriovVfs" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv4AddressList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv6AddressList" />
+                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v10.Vlans"/>
+                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v10.SriovVfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Logical interfaces, e.g., a vnic." />
-                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
-                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
-                <xml-property name="container" value="l-interfaces" />
+                <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
+                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name"/>
+                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface"/>
+                <xml-property name="container" value="l-interfaces"/>
+                <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="SriovVfs">
             <xml-properties>
-                <xml-property name="description" value="Collection of SR-IOV Virtual Functions." />
+                <xml-property name="description" value="Collection of SR-IOV Virtual Functions."/>
             </xml-properties>
-            <xml-root-element name="sriov-vfs" />
+            <xml-root-element name="sriov-vfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v10.SriovVf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v10.SriovVf"/>
             </java-attributes>
         </java-type>
         <java-type name="SriovVf">
-            <xml-root-element name="sriov-vf" />
+            <xml-root-element name="sriov-vf"/>
             <java-attributes>
                 <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="PCI ID used to identify the sriov-vf" />
+                        <xml-property name="description" value="PCI ID used to identify the sriov-vf"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." />
+                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." />
+                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." />
+                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." />
+                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" />
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" />
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" />
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." />
+                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto." />
+                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
                     </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-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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface" />
+                        <xml-property name="description" value="Neutron network id of the interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
-                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" />
-                <xml-property name="dependentOn" value="l-interface" />
-                <xml-property name="container" value="sriov-vfs" />
+                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
+                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="sriov-vfs"/>
+                <xml-property name="uriTemplate" value="/sriov-vfs/sriov-vf/{pci-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="L3InterfaceIpv4AddressList">
-            <xml-root-element name="l3-interface-ipv4-address-list" />
+            <xml-root-element name="l3-interface-ipv4-address-list"/>
             <java-attributes>
                 <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="IP address" />
+                        <xml-property name="description" value="IP address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix length, 32 for single address" />
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag" />
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag" />
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator of fixed or floating address" />
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
                     </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-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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="IPv4 Address Range" />
-                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-                <xml-property name="dependentOn" value="vlan,l-interface" />
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface"/>
+            <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Vlans">
-            <xml-root-element name="vlans" />
+            <xml-root-element name="vlans"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v10.Vlan" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v10.Vlan"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Vlan">
-            <xml-root-element name="vlan" />
+            <xml-root-element name="vlan"/>
             <java-attributes>
                 <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="String that identifies the interface" />
+                        <xml-property name="description" value="String that identifies the interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag" />
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag" />
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </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-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="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to describe (the service associated with) the vlan" />
+                        <xml-property name="description" value="Used to describe (the service associated with) the vlan"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." />
+                        <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 java-attribute="vpnId" name="vpn-id" type="java.lang.String">
+                <xml-element java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
-                        <xml-property name="dbAlias" value="vpn-id-local" />
+                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." />
+                        <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-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.v10.RelationshipList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv4AddressList" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv6AddressList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Definition of vlan" />
-                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
-                <xml-property name="uniqueProps" value="vpn-id" />
-                <xml-property name="dependentOn" value="l-interface" />
-                <xml-property name="container" value="vlans" />
+                <xml-property name="description" value="Definition of vlan"/>
+                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="vlans"/>
+                <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="L3InterfaceIpv6AddressList">
-            <xml-root-element name="l3-interface-ipv6-address-list" />
+            <xml-root-element name="l3-interface-ipv6-address-list"/>
             <java-attributes>
                 <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="IP address" />
+                        <xml-property name="description" value="IP address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix length, 128 for single address" />
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag" />
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag" />
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator of fixed or floating address" />
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
                     </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-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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="IPv6 Address Range" />
-                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-                <xml-property name="dependentOn" value="vlan,l-interface" />
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface"/>
+            <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Volumes">
             <xml-properties>
-                <xml-property name="description" value="Collection of ephemeral Block storage volumes." />
+                <xml-property name="description" value="Collection of ephemeral Block storage volumes."/>
             </xml-properties>
-            <xml-root-element name="volumes" />
+            <xml-root-element name="volumes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v10.Volume" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v10.Volume"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Volume">
-            <xml-root-element name="volume" />
+            <xml-root-element name="volume"/>
             <java-attributes>
                 <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver." />
+                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Ephemeral Block storage volume." />
-                <xml-property name="indexedProps" value="volume-id" />
-                <xml-property name="dependentOn" value="vserver" />
-                <xml-property name="container" value="volumes" />
+                <xml-property name="description" value="Ephemeral Block storage volume."/>
+                <xml-property name="indexedProps" value="volume-id"/>
+                <xml-property name="dependentOn" value="vserver"/>
+                <xml-property name="container" value="volumes"/>
+                <xml-property name="uriTemplate" value="/volumes/volume/{volume-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Flavors">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack flavors." />
+                <xml-property name="description" value="Collection of openstack flavors."/>
             </xml-properties>
-            <xml-root-element name="flavors" />
+            <xml-root-element name="flavors"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v10.Flavor" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v10.Flavor"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Flavor">
-            <xml-root-element name="flavor" />
+            <xml-root-element name="flavor"/>
             <java-attributes>
                 <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region." />
+                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Flavor name" />
+                        <xml-property name="description" value="Flavor name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Number of CPUs" />
+                        <xml-property name="description" value="Number of CPUs"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Amount of memory" />
+                        <xml-property name="description" value="Amount of memory"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Disk space" />
+                        <xml-property name="description" value="Disk space"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Amount of ephemeral disk space" />
+                        <xml-property name="description" value="Amount of ephemeral disk space"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="amount of swap space allocation" />
+                        <xml-property name="description" value="amount of swap space allocation"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." />
+                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" />
+                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack flavor." />
-                <xml-property name="nameProps" value="flavor-name" />
-                <xml-property name="indexedProps" value="flavor-name,flavor-id" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="flavors" />
+                <xml-property name="description" value="Openstack flavor."/>
+                <xml-property name="nameProps" value="flavor-name"/>
+                <xml-property name="indexedProps" value="flavor-name,flavor-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="flavors"/>
+                <xml-property name="uriTemplate" value="/flavors/flavor/{flavor-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Snapshots">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack snapshots" />
+                <xml-property name="description" value="Collection of openstack snapshots"/>
             </xml-properties>
-            <xml-root-element name="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.v10.Snapshot" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v10.Snapshot"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Snapshot">
-            <xml-root-element name="snapshot" />
+            <xml-root-element name="snapshot"/>
             <java-attributes>
                 <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." />
+                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Snapshot name" />
+                        <xml-property name="description" value="Snapshot name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Operating system architecture" />
+                        <xml-property name="description" value="Operating system architecture"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The common name of the operating system distribution in lowercase" />
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The operating system version as specified by the distributor." />
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="application" name="application" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The application that the image instantiates." />
+                        <xml-property name="description" value="The application that the image instantiates."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The vendor of the application." />
+                        <xml-property name="description" value="The vendor of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The version of the application." />
+                        <xml-property name="description" value="The version of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." />
+                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack snapshot" />
-                <xml-property name="nameProps" value="snapshot-name" />
-                <xml-property name="uniqueProps" value="snapshot-id" />
-                <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-property name="description" value="Openstack snapshot"/>
+                <xml-property name="nameProps" value="snapshot-name"/>
+                <xml-property name="uniqueProps" value="snapshot-id"/>
+                <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-property name="uriTemplate" value="/snapshots/snapshot/{snapshot-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="GroupAssignments">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack group assignments" />
+                <xml-property name="description" value="Collection of openstack group assignments"/>
             </xml-properties>
-            <xml-root-element name="group-assignments" />
+            <xml-root-element name="group-assignments"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v10.GroupAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v10.GroupAssignment"/>
             </java-attributes>
         </java-type>
 
         <java-type name="GroupAssignment">
-            <xml-root-element name="group-assignment" />
+            <xml-root-element name="group-assignment"/>
             <java-attributes>
                 <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Group id, expected to be unique across cloud-region." />
+                        <xml-property name="description" value="Group id, expected to be unique across cloud-region."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Group type - the type of group this instance refers to" />
+                        <xml-property name="description" value="Group type - the type of group this instance refers to"/>
                     </xml-properties>
                 </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-property name="description" value="Group name - name assigned to the group"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Group description - description of the group" />
+                        <xml-property name="description" value="Group description - description of the group"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
-                <xml-property name="nameProps" value="group-name" />
-                <xml-property name="indexedProps" value="group-id,group-type,group-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="group-assignments" />
+                <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)."/>
+                <xml-property name="nameProps" value="group-name"/>
+                <xml-property name="indexedProps" value="group-id,group-type,group-name"/>
+                <xml-property name="searchable" value="group-id,group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="group-assignments"/>
+                <xml-property name="uriTemplate" value="/group-assignments/group-assignment/{group-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Images">
             <xml-properties>
-                <xml-property name="description" value="Collectio of Openstack images." />
+                <xml-property name="description" value="Collectio of Openstack images."/>
             </xml-properties>
-            <xml-root-element name="images" />
+            <xml-root-element name="images"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v10.Image" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v10.Image"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Image">
-            <xml-root-element name="image" />
+            <xml-root-element name="image"/>
             <java-attributes>
                 <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Image id, expected to be unique across cloud region" />
+                        <xml-property name="description" value="Image id, expected to be unique across cloud region"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Image name" />
+                        <xml-property name="description" value="Image name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Operating system architecture." />
+                        <xml-property name="description" value="Operating system architecture."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The common name of the operating system distribution in lowercase" />
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The operating system version as specified by the distributor." />
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="application" name="application" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The application that the image instantiates." />
+                        <xml-property name="description" value="The application that the image instantiates."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The vendor of the application." />
+                        <xml-property name="description" value="The vendor of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The version of the application." />
+                        <xml-property name="description" value="The version of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </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-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.v10.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack image." />
-                <xml-property name="nameProps" value="image-name" />
-                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="images" />
+                <xml-property name="description" value="Openstack image."/>
+                <xml-property name="nameProps" value="image-name"/>
+                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="images"/>
+                <xml-property name="uriTemplate" value="/images/image/{image-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Metadata">
             <xml-properties>
-                <xml-property name="description" value="Collection of metadatum (key/value pairs)" />
+                <xml-property name="description" value="Collection of metadatum (key/value pairs)"/>
             </xml-properties>
-            <xml-root-element name="metadata" />
+            <xml-root-element name="metadata"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v10.Metadatum" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v10.Metadatum"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Metadatum">
-            <xml-root-element name="metadatum" />
+            <xml-root-element name="metadatum"/>
             <java-attributes>
-                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
-                <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String" />
+                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="metaval" name="metaval" required="true" 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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Key/value pairs" />
-                <xml-property name="indexedProps" value="metaname" />
-                <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" />
-                <xml-property name="container" value="metadata" />
+                <xml-property name="description" value="Key/value pairs"/>
+                <xml-property name="indexedProps" value="metaname"/>
+                <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model"/>
+                <xml-property name="container" value="metadata"/>
+                <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="DvsSwitches">
             <xml-properties>
-                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." />
+                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs."/>
             </xml-properties>
-            <xml-root-element name="dvs-switches" />
+            <xml-root-element name="dvs-switches"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v10.DvsSwitch" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v10.DvsSwitch"/>
             </java-attributes>
         </java-type>
 
         <java-type name="DvsSwitch">
-            <xml-root-element name="dvs-switch" />
+            <xml-root-element name="dvs-switch"/>
             <java-attributes>
                 <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="DVS switch name" />
+                        <xml-property name="description" value="DVS switch name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL used to reach the vcenter" />
+                        <xml-property name="description" value="URL used to reach the vcenter"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
-                <xml-property name="indexedProps" value="vcenter-url,switch-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="dvs-switches" />
+                <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
+                <xml-property name="indexedProps" value="vcenter-url,switch-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="dvs-switches"/>
+                <xml-property name="uriTemplate" value="/dvs-switches/dvs-switch/{switch-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="NetworkProfiles">
             <xml-properties>
-                <xml-property name="description" value="Collection of network profiles" />
+                <xml-property name="description" value="Collection of network profiles"/>
             </xml-properties>
-            <xml-root-element name="network-profiles" />
+            <xml-root-element name="network-profiles"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v10.NetworkProfile" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v10.NetworkProfile"/>
             </java-attributes>
         </java-type>
 
         <java-type name="NetworkProfile">
-            <xml-root-element name="network-profile" />
+            <xml-root-element name="network-profile"/>
             <java-attributes>
                 <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique name of network profile." />
+                        <xml-property name="description" value="Unique name of network profile."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encrypted SNMP community string" />
+                        <xml-property name="description" value="Encrypted SNMP community string"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
-                <xml-property name="indexedProps" value="nm-profile-name" />
-                <xml-property name="container" value="network-profiles" />
-                <xml-property name="namespace" value="cloud-infrastructure" />
+                <xml-property name="description" value="Network profile populated by SDN-GP for SNMP"/>
+                <xml-property name="indexedProps" value="nm-profile-name"/>
+                <xml-property name="container" value="network-profiles"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Pservers">
             <xml-properties>
-                <xml-property name="description" value="Collection of compute hosts." />
+                <xml-property name="description" value="Collection of compute hosts."/>
             </xml-properties>
-            <xml-root-element name="pservers" />
+            <xml-root-element name="pservers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v10.Pserver" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v10.Pserver"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Pserver">
-            <xml-root-element name="pserver" />
+            <xml-root-element name="pserver"/>
             <java-attributes>
                 <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Value from executing hostname on the compute node." />
+                        <xml-property name="description" value="Value from executing hostname on the compute node."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="PTNII name" />
+                        <xml-property name="description" value="PTNII name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Number of cpus" />
+                        <xml-property name="description" value="Number of cpus"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Disk size, in GBs" />
+                        <xml-property name="description" value="Disk size, in GBs"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="RAM size, in MBs" />
+                        <xml-property name="description" value="RAM size, in MBs"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Fully-qualified domain name" />
+                        <xml-property name="description" value="Fully-qualified domain name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." />
+                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Serial number, may be queried" />
+                        <xml-property name="description" value="Serial number, may be queried"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 Loopback 0 address" />
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 Loopback 0 address" />
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 AIM address" />
+                        <xml-property name="description" value="IPV4 AIM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 AIM address" />
+                        <xml-property name="description" value="IPV6 AIM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 OAM address" />
+                        <xml-property name="description" value="IPV6 OAM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of Pserver" />
+                        <xml-property name="description" value="ID of Pserver"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="internet topology of Pserver" />
+                        <xml-property name="description" value="internet topology of Pserver"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                <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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                        <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 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="pserverName2" name="pserver-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="alternative pserver name" />
+                        <xml-property name="description" value="alternative pserver name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="purpose of pserver" />
+                        <xml-property name="description" value="purpose of pserver"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
-                <xml-property name="nameProps" value="pserver-name2" />
-                <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status" />
-                <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" />
-                <xml-property name="container" value="pservers" />
-                <xml-property name="namespace" value="cloud-infrastructure" />
+                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
+                <xml-property name="nameProps" value="pserver-name2"/>
+                <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status"/>
+                <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address"/>
+                <xml-property name="uniqueProps" value="hostname"/>
+                <xml-property name="container" value="pservers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/pservers/pserver/{hostname}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="PInterfaces">
             <xml-properties>
-                <xml-property name="description" value="Collection of physical interfaces." />
+                <xml-property name="description" value="Collection of physical interfaces."/>
             </xml-properties>
-            <xml-root-element name="p-interfaces" />
+            <xml-root-element name="p-interfaces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v10.PInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v10.PInterface"/>
             </java-attributes>
         </java-type>
 
         <java-type name="PInterface">
-            <xml-root-element name="p-interface" />
+            <xml-root-element name="p-interface"/>
             <java-attributes>
                 <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name that identifies the physical interface" />
+                        <xml-property name="description" value="Name that identifies the physical interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Nature of the services and connectivity on this port." />
+                        <xml-property name="description" value="Nature of the services and connectivity on this port."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CLEI or other specification for p-interface hardware." />
+                        <xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role specification for p-interface hardware." />
+                        <xml-property name="description" value="Role specification for p-interface hardware."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates the physical properties of the interface." />
+                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </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-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-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.v10.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Physical interface (e.g., nic)" />
-                <xml-property name="indexedProps" value="interface-name,prov-status" />
-                <xml-property name="nameProps" value="prov-status" />
-                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
-                <xml-property name="container" value="p-interfaces" />
+                <xml-property name="description" value="Physical interface (e.g., nic)"/>
+                <xml-property name="indexedProps" value="interface-name,prov-status"/>
+                <xml-property name="nameProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
+                <xml-property name="container" value="p-interfaces"/>
+                <xml-property name="uriTemplate" value="/p-interfaces/p-interface/{interface-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="LagInterfaces">
             <xml-properties>
-                <xml-property name="description" value="Collection of link aggregate interfaces." />
+                <xml-property name="description" value="Collection of link aggregate interfaces."/>
             </xml-properties>
-            <xml-root-element name="lag-interfaces" />
+            <xml-root-element name="lag-interfaces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v10.LagInterface" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v10.LagInterface"/>
             </java-attributes>
         </java-type>
 
         <java-type name="LagInterface">
-            <xml-root-element name="lag-interface" />
+            <xml-root-element name="lag-interface"/>
             <java-attributes>
                 <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name that identifies the link aggregate interface" />
+                        <xml-property name="description" value="Name that identifies the link aggregate interface"/>
                     </xml-properties>
                 </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-property name="description" value="Human friendly text regarding this interface."/>
                     </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-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="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of interface" />
+                        <xml-property name="description" value="ID of interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                        <xml-property name="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-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.v10.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Link aggregate interface" />
-                <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-property name="description" value="Link aggregate interface"/>
+                <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-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="OamNetworks">
             <xml-properties>
-                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. " />
+                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. "/>
             </xml-properties>
-            <xml-root-element name="oam-networks" />
+            <xml-root-element name="oam-networks"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v10.OamNetwork" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v10.OamNetwork"/>
             </java-attributes>
         </java-type>
 
         <java-type name="OamNetwork">
-            <xml-root-element name="oam-network" />
+            <xml-root-element name="oam-network"/>
             <java-attributes>
                 <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region" />
+                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the network." />
+                        <xml-property name="description" value="Name of the network."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="cvlan-id" />
+                        <xml-property name="description" value="cvlan-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
-                <xml-property name="nameProps" value="network-name" />
-                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="oam-networks" />
+                <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="oam-networks"/>
+                <xml-property name="uriTemplate" value="/oam-networks/oam-network/{network-uuid}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="AvailabilityZones">
             <xml-properties>
-                <xml-property name="description" value="Collection of availability zones" />
+                <xml-property name="description" value="Collection of availability zones"/>
             </xml-properties>
-            <xml-root-element name="availability-zones" />
+            <xml-root-element name="availability-zones"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v10.AvailabilityZone" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v10.AvailabilityZone"/>
             </java-attributes>
         </java-type>
 
         <java-type name="AvailabilityZone">
-            <xml-root-element name="availability-zone" />
+            <xml-root-element name="availability-zone"/>
             <java-attributes>
                 <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region" />
+                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
+                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
-                <xml-property name="indexedProps" value="availability-zone-name" />
-                <xml-property name="dependentOn" value="cloud-region" />
-                <xml-property name="container" value="availability-zones" />
+                <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers"/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="availability-zones"/>
+                <xml-property name="uriTemplate" value="/availability-zones/availability-zone/{availability-zone-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="VirtualDataCenters">
             <xml-properties>
-                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
             </xml-properties>
-            <xml-root-element name="virtual-data-centers" />
+            <xml-root-element name="virtual-data-centers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v10.VirtualDataCenter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v10.VirtualDataCenter"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VirtualDataCenter">
-            <xml-root-element name="virtual-data-center" />
+            <xml-root-element name="virtual-data-center"/>
             <java-attributes>
                 <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of the vdc" />
+                        <xml-property name="description" value="Unique ID of the vdc"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the virtual data center" />
+                        <xml-property name="description" value="Name of the virtual data center"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-                <xml-property name="nameProps" value="vdc-name" />
-                <xml-property name="indexedProps" value="vdc-name,vdc-id" />
-                <xml-property name="container" value="virtual-data-centers" />
-                <xml-property name="namespace" value="cloud-infrastructure" />
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+                <xml-property name="nameProps" value="vdc-name"/>
+                <xml-property name="indexedProps" value="vdc-name,vdc-id"/>
+                <xml-property name="container" value="virtual-data-centers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}"/>
             </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="Namespace for business related constructs"/>
             </xml-properties>
-            <xml-root-element name="business" />
+            <xml-root-element name="business"/>
             <java-attributes>
-                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v10.Connectors" />
-                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v10.Customers" />
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v10.Connectors"/>
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v10.Customers"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Connectors">
             <xml-properties>
-                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
             </xml-properties>
-            <xml-root-element name="connectors" />
+            <xml-root-element name="connectors"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v10.Connector" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v10.Connector"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Connector">
-            <xml-root-element name="connector" />
+            <xml-root-element name="connector"/>
             <java-attributes>
                 <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of resource instance." />
+                        <xml-property name="description" value="Unique id of resource instance."/>
                     </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-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="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="requires" value="model-version-id" />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
                         <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </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-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">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                        <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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata"/>
             </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,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-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,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-property name="uriTemplate" value="/business/connectors/connector/{resource-instance-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Customers">
             <xml-properties>
-                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." />
+                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
             </xml-properties>
-            <xml-root-element name="customers" />
+            <xml-root-element name="customers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v10.Customer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v10.Customer"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Customer">
-            <xml-root-element name="customer" />
+            <xml-root-element name="customer"/>
             <java-attributes>
                 <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." />
+                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
+                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." />
-                        <xml-property name="defaultValue" value="CUST" />
+                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers."/>
+                        <xml-property name="defaultValue" value="CUST"/>
                     </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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v10.ServiceSubscriptions" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v10.ServiceSubscriptions"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
-                <xml-property name="nameProps" value="subscriber-name" />
-                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
-                <xml-property name="searchable" value="global-customer-id,subscriber-name" />
-                <xml-property name="uniqueProps" value="global-customer-id" />
-                <xml-property name="container" value="customers" />
-                <xml-property name="namespace" value="business" />
+                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
+                <xml-property name="nameProps" value="subscriber-name"/>
+                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type"/>
+                <xml-property name="searchable" value="global-customer-id,subscriber-name"/>
+                <xml-property name="uniqueProps" value="global-customer-id"/>
+                <xml-property name="container" value="customers"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/customers/customer/{global-customer-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="ServiceSubscriptions">
             <xml-properties>
-                <xml-property name="description" value="Collection of objects that group service instances." />
+                <xml-property name="description" value="Collection of objects that group service instances."/>
             </xml-properties>
-            <xml-root-element name="service-subscriptions" />
+            <xml-root-element name="service-subscriptions"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v10.ServiceSubscription" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v10.ServiceSubscription"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ServiceSubscription">
-            <xml-root-element name="service-subscription" />
+            <xml-root-element name="service-subscription"/>
             <java-attributes>
                 <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." />
+                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution." />
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
                     </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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v10.ServiceInstances">
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Object that group service instances." />
-                <xml-property name="indexedProps" value="service-type" />
-                <xml-property name="dependentOn" value="customer" />
-                <xml-property name="container" value="service-subscriptions" />
-                <xml-property name="crossEntityReference" value="service-instance,service-type" />
+                <xml-property name="description" value="Object that group service instances."/>
+                <xml-property name="indexedProps" value="service-type"/>
+                <xml-property name="dependentOn" value="customer"/>
+                <xml-property name="container" value="service-subscriptions"/>
+                <xml-property name="crossEntityReference" value="service-instance,service-type"/>
+                <xml-property name="uriTemplate" value="/service-subscriptions/service-subscription/{service-type}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="ServiceInstances">
             <xml-properties>
-                <xml-property name="description" value="Collection of service instances" />
+                <xml-property name="description" value="Collection of service instances"/>
             </xml-properties>
-            <xml-root-element name="service-instances" />
+            <xml-root-element name="service-instances"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v10.ServiceInstance" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v10.ServiceInstance"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ServiceInstance">
-            <xml-root-element name="service-instance" />
+            <xml-root-element name="service-instance"/>
             <java-attributes>
                 <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Uniquely identifies this instance of a service" />
+                        <xml-property name="description" value="Uniquely identifies this instance of a service"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This field will store a name assigned to the service-instance." />
+                        <xml-property name="description" value="This field will store a name assigned to the service-instance."/>
                     </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="requires" value="model-version-id" />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
                         <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </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-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">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                        <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-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="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
+                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL customers will use to access the vHN Portal." />
+                        <xml-property name="description" value="URL customers will use to access the vHN Portal."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
+                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used."/>
                     </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-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="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Path to the controller object." />
+                        <xml-property name="description" value="Path to the controller object."/>
                     </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 service." />
+                        <xml-property name="description" value="Orchestration status of this service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
-                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v10.AllottedResources" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata"/>
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v10.AllottedResources"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Instance of a service" />
-                <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" />
-                <xml-property name="dependentOn" value="service-subscription" />
-                <xml-property name="container" value="service-instances" />
+                <xml-property name="description" value="Instance of a service"/>
+                <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"/>
+                <xml-property name="dependentOn" value="service-subscription"/>
+                <xml-property name="container" value="service-instances"/>
+                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="ServiceDesignAndCreation">
             <xml-properties>
-                <xml-property name="description" value="Namespace for objects managed by ASDC" />
+                <xml-property name="description" value="Namespace for objects managed by ASDC"/>
             </xml-properties>
-            <xml-root-element name="service-design-and-creation" />
+            <xml-root-element name="service-design-and-creation"/>
             <java-attributes>
-                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v10.VnfImages" />
-                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v10.Services" />
-                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v10.ServiceCapabilities" />
-                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v10.Models" />
-                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v10.NamedQueries" />
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v10.VnfImages"/>
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v10.Services"/>
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v10.ServiceCapabilities"/>
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v10.Models"/>
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v10.NamedQueries"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VnfImages">
             <xml-properties>
-                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
+                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
             </xml-properties>
-            <xml-root-element name="vnf-images" />
+            <xml-root-element name="vnf-images"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v10.VnfImage" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v10.VnfImage"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VnfImage">
-            <xml-root-element name="vnf-image" />
+            <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-properties>
-                        <xml-property name="description" value="Unique ID of this asset" />
+                        <xml-property name="description" value="Unique ID of this asset"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The application that the image instantiates." />
+                        <xml-property name="description" value="The application that the image instantiates."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The vendor of the application." />
+                        <xml-property name="description" value="The vendor of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The version of the application." />
+                        <xml-property name="description" value="The version of the application."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
+                <xml-property name="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="container" value="vnf-images" />
-                <xml-property name="namespace" value="service-design-and-creation" />
+                <xml-property name="container" value="vnf-images"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/vnf-images/vnf-image/{att-uuid}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Services">
             <xml-properties>
-                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC." />
+                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
             </xml-properties>
-            <xml-root-element name="services" />
+            <xml-root-element name="services"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v10.Service" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v10.Service"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Service">
-            <xml-root-element name="service" />
+            <xml-root-element name="service"/>
             <java-attributes>
                 <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description of the service" />
+                        <xml-property name="description" value="Description of the service"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </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-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="serviceVersion" name="service-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="service version" />
+                        <xml-property name="description" value="service version"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
-                <xml-property name="indexedProps" value="service-description,service-id" />
-                <xml-property name="container" value="services" />
-                <xml-property name="namespace" value="service-design-and-creation" />
+                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services."/>
+                <xml-property name="indexedProps" value="service-description,service-id"/>
+                <xml-property name="container" value="services"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/services/service/{service-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="ServiceCapabilities">
             <xml-properties>
-                <xml-property name="description" value="Collection of service capabilities." />
+                <xml-property name="description" value="Collection of service capabilities."/>
             </xml-properties>
-            <xml-root-element name="service-capabilities" />
+            <xml-root-element name="service-capabilities"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v10.ServiceCapability" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v10.ServiceCapability"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ServiceCapability">
-            <xml-root-element name="service-capability" />
+            <xml-root-element name="service-capability"/>
             <java-attributes>
                 <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the 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="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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
-                <xml-property name="indexedProps" value="service-type,vnf-type" />
-                <xml-property name="container" value="service-capabilities" />
-                <xml-property name="namespace" value="service-design-and-creation" />
+                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
+                <xml-property name="indexedProps" value="service-type,vnf-type"/>
+                <xml-property name="container" value="service-capabilities"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Network">
             <xml-properties>
-                <xml-property name="description" value="Namespace for network inventory resources." />
+                <xml-property name="description" value="Namespace for network inventory resources."/>
             </xml-properties>
-            <xml-root-element name="network" />
+            <xml-root-element name="network"/>
             <java-attributes>
-                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v10.LogicalLinks" />
-                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v10.SitePairSets" />
-                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v10.VpnBindings" />
-                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v10.VplsPes" />
-                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v10.MulticastConfigurations" />
-                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v10.Vces" />
-                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v10.Vnfcs" />
-                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v10.L3Networks" />
-                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v10.NetworkPolicies" />
-                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v10.GenericVnfs" />
-                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v10.LagLinks" />
-                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v10.Newvces" />
-                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v10.Pnfs" />
-                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v10.PhysicalLinks" />
-                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v10.IpsecConfigurations" />
-                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v10.RouteTableReferences" />
-                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v10.InstanceGroups" />
-                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v10.Zones" />
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v10.LogicalLinks"/>
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v10.SitePairSets"/>
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v10.VpnBindings"/>
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v10.VplsPes"/>
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v10.MulticastConfigurations"/>
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v10.Vces"/>
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v10.Vnfcs"/>
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v10.L3Networks"/>
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v10.NetworkPolicies"/>
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v10.GenericVnfs"/>
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v10.LagLinks"/>
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v10.Newvces"/>
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v10.Pnfs"/>
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v10.PhysicalLinks"/>
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v10.IpsecConfigurations"/>
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v10.RouteTableReferences"/>
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v10.InstanceGroups"/>
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v10.Zones"/>
             </java-attributes>
         </java-type>
 
         <java-type name="LogicalLinks">
             <xml-properties>
-                <xml-property name="description" value="Collection of logical connections" />
+                <xml-property name="description" value="Collection of logical connections"/>
             </xml-properties>
-            <xml-root-element name="logical-links" />
+            <xml-root-element name="logical-links"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v10.LogicalLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v10.LogicalLink"/>
             </java-attributes>
         </java-type>
 
         <java-type name="LogicalLink">
-            <xml-root-element name="logical-link" />
+            <xml-root-element name="logical-link"/>
             <java-attributes>
                 <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
+                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of logical link, e.g., evc" />
+                        <xml-property name="description" value="Type of logical link, e.g., evc"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
@@ -2415,1159 +2444,1176 @@
                 </xml-element>
                 <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="For example, static or BGP" />
+                        <xml-property name="description" value="For example, static or BGP"/>
                     </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-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="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="requires" value="model-version-id" />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
                         <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </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-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">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                        <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-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="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indication of operational status of the logical link." />
+                        <xml-property name="description" value="Indication of operational status of the logical link."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indication of the network use of the logical link." />
+                        <xml-property name="description" value="Indication of the network use of the logical link."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
+                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
+                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Circuit id" />
+                        <xml-property name="description" value="Circuit id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Reason for this entity, role it is playing" />
+                        <xml-property name="description" value="Reason for this entity, role it is playing"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
-                <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-property name="searchable" value="link-name" />
+                <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,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-property name="searchable" value="link-name"/>
+                <xml-property name="uriTemplate" value="/network/logical-links/logical-link/{link-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="SitePairSets">
             <xml-properties>
-                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" />
+                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf"/>
             </xml-properties>
-            <xml-root-element name="site-pair-sets" />
+            <xml-root-element name="site-pair-sets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v10.SitePairSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v10.SitePairSet"/>
             </java-attributes>
         </java-type>
 
         <java-type name="SitePairSet">
-            <xml-root-element name="site-pair-set" />
+            <xml-root-element name="site-pair-set"/>
             <java-attributes>
                 <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of site pair set." />
+                        <xml-property name="description" value="Unique id of site pair set."/>
                     </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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v10.RoutingInstances" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v10.RoutingInstances"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
-                <xml-property name="indexedProps" value="site-pair-set-id" />
-                <xml-property name="uniqueProps" value="site-pair-set-id" />
-                <xml-property name="container" value="site-pair-sets" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
+                <xml-property name="indexedProps" value="site-pair-set-id"/>
+                <xml-property name="uniqueProps" value="site-pair-set-id"/>
+                <xml-property name="container" value="site-pair-sets"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/site-pair-sets/site-pair-set/{site-pair-set-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="RoutingInstances">
             <xml-properties>
-                <xml-property name="description" value="set of probes related to generic-vnf routing instance" />
+                <xml-property name="description" value="set of probes related to generic-vnf routing instance"/>
             </xml-properties>
-            <xml-root-element name="routing-instances" />
+            <xml-root-element name="routing-instances"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v10.RoutingInstance" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v10.RoutingInstance"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RoutingInstance">
-            <xml-root-element name="routing-instance" />
+            <xml-root-element name="routing-instance"/>
             <java-attributes>
                 <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of routing instance" />
+                        <xml-property name="description" value="Unique id of routing instance"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="rpm owner" />
+                        <xml-property name="description" value="rpm owner"/>
                     </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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v10.SitePairs" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v10.SitePairs"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="routing-instance-id" />
-                <xml-property name="uniqueProps" value="routing-instance-id" />
-                <xml-property name="dependentOn" value="site-pair-set" />
-                <xml-property name="container" value="routing-instances" />
+                <xml-property name="indexedProps" value="routing-instance-id"/>
+                <xml-property name="uniqueProps" value="routing-instance-id"/>
+                <xml-property name="dependentOn" value="site-pair-set"/>
+                <xml-property name="container" value="routing-instances"/>
+                <xml-property name="uriTemplate" value="/routing-instances/routing-instance/{routing-instance-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="SitePairs">
             <xml-properties>
-                <xml-property name="description" value="probe within a set" />
+                <xml-property name="description" value="probe within a set"/>
             </xml-properties>
-            <xml-root-element name="site-pairs" />
+            <xml-root-element name="site-pairs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v10.SitePair" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v10.SitePair"/>
             </java-attributes>
         </java-type>
 
         <java-type name="SitePair">
-            <xml-root-element name="site-pair" />
+            <xml-root-element name="site-pair"/>
             <java-attributes>
                 <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="unique identifier of probe" />
+                        <xml-property name="description" value="unique identifier of probe"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix address" />
+                        <xml-property name="description" value="Prefix address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix address" />
+                        <xml-property name="description" value="Prefix address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ip version, v4, v6" />
+                        <xml-property name="description" value="ip version, v4, v6"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." />
+                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, etc." />
+                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc."/>
                     </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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v10.ClassesOfService" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v10.ClassesOfService"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="site-pair-id" />
-                <xml-property name="uniqueProps" value="site-pair-id" />
-                <xml-property name="dependentOn" value="routing-instance" />
-                <xml-property name="container" value="site-pairs" />
+                <xml-property name="indexedProps" value="site-pair-id"/>
+                <xml-property name="uniqueProps" value="site-pair-id"/>
+                <xml-property name="dependentOn" value="routing-instance"/>
+                <xml-property name="container" value="site-pairs"/>
+                <xml-property name="uriTemplate" value="/site-pairs/site-pair/{site-pair-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="ClassesOfService">
             <xml-properties>
-                <xml-property name="description" value="class-of-service of probe" />
+                <xml-property name="description" value="class-of-service of probe"/>
             </xml-properties>
-            <xml-root-element name="classes-of-service" />
+            <xml-root-element name="classes-of-service"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v10.ClassOfService" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v10.ClassOfService"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ClassOfService">
-            <xml-root-element name="class-of-service" />
+            <xml-root-element name="class-of-service"/>
             <java-attributes>
                 <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="unique identifier of probe" />
+                        <xml-property name="description" value="unique identifier of probe"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="identifier of probe" />
+                        <xml-property name="description" value="identifier of probe"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="type of probe" />
+                        <xml-property name="description" value="type of probe"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="cos" />
-                <xml-property name="dependentOn" value="site-pair" />
-                <xml-property name="container" value="classes-of-service" />
+                <xml-property name="indexedProps" value="cos"/>
+                <xml-property name="dependentOn" value="site-pair"/>
+                <xml-property name="container" value="classes-of-service"/>
+                <xml-property name="uriTemplate" value="/classes-of-service/class-of-service/{cos}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="VpnBindings">
-            <xml-root-element name="vpn-bindings" />
+            <xml-root-element name="vpn-bindings"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v10.VpnBinding" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v10.VpnBinding"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VpnBinding">
-            <xml-root-element name="vpn-binding" />
+            <xml-root-element name="vpn-binding"/>
             <java-attributes>
                 <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI" />
+                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="VPN Name" />
+                        <xml-property name="description" value="VPN Name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" />
+                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
+                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
+                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network."/>
                     </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-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.v10.RouteTargets" />
+                <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v10.RouteTargets"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList">
                     <xml-properties>
-                        <xml-property name="description" value="l3-networks relate to vpn-bindings" />
+                        <xml-property name="description" value="l3-networks relate to vpn-bindings"/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="VPN binding" />
-                <xml-property name="nameProps" value="vpn-name,vpn-type" />
-                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type" />
-                <xml-property name="searchable" value="vpn-id,vpn-name" />
-                <xml-property name="uniqueProps" value="vpn-id" />
-                <xml-property name="container" value="vpn-bindings" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="VPN binding"/>
+                <xml-property name="nameProps" value="vpn-name,vpn-type"/>
+                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type"/>
+                <xml-property name="searchable" value="vpn-id,vpn-name"/>
+                <xml-property name="uniqueProps" value="vpn-id"/>
+                <xml-property name="container" value="vpn-bindings"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpn-bindings/vpn-binding/{vpn-id}"/>
             </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="Collection of VPLS Provider Edge routers"/>
             </xml-properties>
-            <xml-root-element name="vpls-pes" />
+            <xml-root-element name="vpls-pes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v10.VplsPe" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v10.VplsPe"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VplsPe">
-            <xml-root-element name="vpls-pe" />
+            <xml-root-element name="vpls-pe"/>
             <java-attributes>
-                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" />
+                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"/>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
+                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Temporary location for stag to get to VCE" />
+                        <xml-property name="description" value="Temporary location for stag to get to VCE"/>
                     </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-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.v10.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="VPLS Provider Edge routers." />
-                <xml-property name="indexedProps" value="prov-status,equipment-name" />
-                <xml-property name="container" value="vpls-pes" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="VPLS Provider Edge routers."/>
+                <xml-property name="indexedProps" value="prov-status,equipment-name"/>
+                <xml-property name="container" value="vpls-pes"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpls-pes/vpls-pe/{equipment-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="MulticastConfigurations">
             <xml-properties>
-                <xml-property name="description" value="multicast configuration of generic-vnf ip-address" />
+                <xml-property name="description" value="multicast configuration of generic-vnf ip-address"/>
             </xml-properties>
-            <xml-root-element name="multicast-configurations" />
+            <xml-root-element name="multicast-configurations"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v10.MulticastConfiguration" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v10.MulticastConfiguration"/>
             </java-attributes>
         </java-type>
 
         <java-type name="MulticastConfiguration">
-            <xml-root-element name="multicast-configuration" />
+            <xml-root-element name="multicast-configuration"/>
             <java-attributes>
                 <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of multicast configuration." />
+                        <xml-property name="description" value="Unique id of multicast configuration."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="protocol of multicast configuration" />
+                        <xml-property name="description" value="protocol of multicast configuration"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="rp type of multicast configuration" />
+                        <xml-property name="description" value="rp type of multicast configuration"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="multicast-configuration-id" />
-                <xml-property name="uniqueProps" value="multicast-configuration-id" />
-                <xml-property name="container" value="multicast-configurations" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="indexedProps" value="multicast-configuration-id"/>
+                <xml-property name="uniqueProps" value="multicast-configuration-id"/>
+                <xml-property name="container" value="multicast-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Vces">
             <xml-properties>
-                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated." />
+                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated."/>
             </xml-properties>
-            <xml-root-element name="vces" />
+            <xml-root-element name="vces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v10.Vce" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v10.Vce"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Vce">
-            <xml-root-element name="vce" />
+            <xml-root-element name="vce"/>
             <java-attributes>
                 <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                        <xml-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-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-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-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 strictly map to ASDC services, SOON TO BE DEPRECATED." />
+                        <xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, 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-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-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                        <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="Network role being played by this VNF" />
+                        <xml-property name="description" value="Network role being played by this VNF"/>
                     </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, mastered by MSO" />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered 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-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-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of VPE connected to this VCE." />
+                        <xml-property name="description" value="Unique ID of VPE connected to this VCE."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
+                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
+                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="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="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Loopback0 address" />
+                        <xml-property name="description" value="Loopback0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  see child relationships" />
+                        <xml-property name="description" value="OBSOLETE -  see child relationships"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v10.PortGroups" />
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v10.Licenses" />
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v10.Entitlements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v10.PortGroups"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v10.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v10.Entitlements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
-                <xml-property name="nameProps" value="vnf-name" />
-                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" />
-                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-                <xml-property name="uniqueProps" value="vnf-id" />
-                <xml-property name="container" value="vces" />
-                <xml-property name="namespace" value="network" />
-                <xml-property name="extends" value="vnf" />
+                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="vces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="uriTemplate" value="/network/vces/vce/{vnf-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="PortGroups">
-            <xml-root-element name="port-groups" />
+            <xml-root-element name="port-groups"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v10.PortGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v10.PortGroup"/>
             </java-attributes>
         </java-type>
 
         <java-type name="PortGroup">
-            <xml-root-element name="port-group" />
+            <xml-root-element name="port-group"/>
             <java-attributes>
                 <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of the interface" />
+                        <xml-property name="description" value="Unique ID of the interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of this Interface" />
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network name of this Interface" />
+                        <xml-property name="description" value="Neutron network name of this Interface"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="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="portGroupId" name="port-group-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID for port group in vmware" />
+                        <xml-property name="description" value="Unique ID for port group in vmware"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Likely to duplicate value of neutron network name" />
+                        <xml-property name="description" value="Likely to duplicate value of neutron network name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
+                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered 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-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-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v10.CvlanTags" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v10.CvlanTags"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Used to capture the network interfaces of this VCE" />
-                <xml-property name="nameProps" value="port-group-name" />
-                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" />
-                <xml-property name="dependentOn" value="vce" />
-                <xml-property name="container" value="port-groups" />
+                <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
+                <xml-property name="nameProps" value="port-group-name"/>
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+                <xml-property name="dependentOn" value="vce"/>
+                <xml-property name="container" value="port-groups"/>
+                <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="CvlanTags">
-            <xml-root-element name="cvlan-tags" />
+            <xml-root-element name="cvlan-tags"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v10.CvlanTagEntry" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v10.CvlanTagEntry"/>
             </java-attributes>
         </java-type>
 
         <java-type name="CvlanTagEntry">
-            <xml-root-element name="cvlan-tag-entry" />
+            <xml-root-element name="cvlan-tag-entry"/>
             <java-attributes>
                 <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="See mis-na-virtualization-platform.yang" />
+                        <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="dependentOn" value="port-group" />
-                <xml-property name="indexedProps" value="cvlan-tag" />
-                <xml-property name="container" value="cvlan-tags" />
+                <xml-property name="dependentOn" value="port-group"/>
+                <xml-property name="indexedProps" value="cvlan-tag"/>
+                <xml-property name="container" value="cvlan-tags"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/>
             </xml-properties>
         </java-type>
 
 
-
         <java-type name="Vnfcs">
             <xml-properties>
-                <xml-property name="description" value="virtual network components associated with a vserver from application controller." />
+                <xml-property name="description" value="virtual network components associated with a vserver from application controller."/>
             </xml-properties>
-            <xml-root-element name="vnfcs" />
+            <xml-root-element name="vnfcs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v10.Vnfc" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v10.Vnfc"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Vnfc">
-            <xml-root-element name="vnfc" />
+            <xml-root-element name="vnfc"/>
             <java-attributes>
                 <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of vnfc." />
+                        <xml-property name="description" value="Unique ID of vnfc."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="function code" />
+                        <xml-property name="description" value="function code"/>
+                        <xml-property name="dbAlias" value="nfc-naming-code"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="type" />
+                        <xml-property name="description" value="type"/>
+                        <xml-property name="dbAlias" value="nfc-function"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="prov status of this vnfc" />
+                        <xml-property name="description" value="prov status of this vnfc"/>
                     </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, mastered by APP-C" />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Oam V4 vip address of this vnfc" />
+                        <xml-property name="description" value="Oam V4 vip address of this vnfc"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                <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-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 default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Group notation of VNFC" />
+                        <xml-property name="description" value="Group notation of VNFC"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
-                <xml-property name="searchable" value="vnfc-name" />
-                <xml-property name="container" value="vnfcs" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation"/>
+                <xml-property name="searchable" value="vnfc-name"/>
+                <xml-property name="container" value="vnfcs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vnfcs/vnfc/{vnfc-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="L3Networks">
-            <xml-root-element name="l3-networks" />
+            <xml-root-element name="l3-networks"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v10.L3Network" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v10.L3Network"/>
             </java-attributes>
         </java-type>
 
         <java-type name="L3Network">
-            <xml-root-element name="l3-network" />
+            <xml-root-element name="l3-network"/>
             <java-attributes>
                 <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI." />
+                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the network, governed by some naming convention.." />
+                        <xml-property name="description" value="Name of the network, governed by some naming convention.."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the network - who defines these values?" />
+                        <xml-property name="description" value="Type of the network - who defines these values?"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role the network plans - who defines these values?" />
+                        <xml-property name="description" value="Role the network plans - who defines these values?"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Network technology - who defines these values?" />
+                        <xml-property name="description" value="Network technology - who defines these values?"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of this Interface" />
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="isBoundToVpn" name="is-bound-to-vpn" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Set to true if bound to VPN" />
+                        <xml-property name="description" value="Set to true if bound to VPN"/>
                     </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 from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED" />
+                        <xml-property name="description" value="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="network role instance" />
+                        <xml-property name="description" value="network role instance"/>
                     </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-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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered 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-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-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Contrail FQDN for the network" />
+                        <xml-property name="description" value="Contrail FQDN for the network"/>
                     </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="requires" value="model-version-id" />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
                         <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </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-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="captures the id of all the configuration used to customize the resource for the service." />
+                        <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-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-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="physicalNetworkName" name="physical-network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name associated with the physical network." />
+                        <xml-property name="description" value="Name associated with the physical network."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network." />
+                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network." />
+                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="boolean indicatating whether or not network is an external network." />
+                        <xml-property name="description" value="boolean indicatating whether or not network is an external network."/>
                     </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-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational." />
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v10.Subnets" />
-                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v10.CtagAssignments" />
-                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v10.SegmentationAssignments" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" >
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v10.Subnets"/>
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v10.CtagAssignments"/>
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v10.SegmentationAssignments"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList">
                     <xml-properties>
-                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
+                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Generic network definition" />
-                <xml-property name="nameProps" value="network-name" />
-                <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
-                <xml-property name="searchable" value="network-id,network-name" />
-                <xml-property name="uniqueProps" value="network-id" />
-                <xml-property name="container" value="l3-networks" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="Generic network definition"/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+                <xml-property name="searchable" value="network-id,network-name"/>
+                <xml-property name="uniqueProps" value="network-id"/>
+                <xml-property name="container" value="l3-networks"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/l3-networks/l3-network/{network-id}"/>
             </xml-properties>
         </java-type>
         <java-type name="NetworkPolicies">
-            <xml-root-element name="network-policies" />
+            <xml-root-element name="network-policies"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v10.NetworkPolicy" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v10.NetworkPolicy"/>
             </java-attributes>
         </java-type>
         <java-type name="NetworkPolicy">
-            <xml-root-element name="network-policy" />
+            <xml-root-element name="network-policy"/>
             <java-attributes>
                 <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID representing unique key to this instance" />
+                        <xml-property name="description" value="UUID representing unique key to this instance"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Contrail FQDN for the policy" />
+                        <xml-property name="description" value="Contrail FQDN for the policy"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID for the openStack Heat instance" />
+                        <xml-property name="description" value="ID for the openStack Heat instance"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="nameProps" value="network-policy-fqdn" />
-                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" />
-                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn" />
-                <xml-property name="uniqueProps" value="network-policy-id" />
-                <xml-property name="container" value="network-policies" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="nameProps" value="network-policy-fqdn"/>
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="uniqueProps" value="network-policy-id"/>
+                <xml-property name="container" value="network-policies"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/network-policies/network-policy/{network-policy-id}"/>
             </xml-properties>
         </java-type>
         <java-type name="CtagAssignments">
-            <xml-root-element name="ctag-assignments" />
+            <xml-root-element name="ctag-assignments"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v10.CtagAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v10.CtagAssignment"/>
             </java-attributes>
         </java-type>
 
         <java-type name="CtagAssignment">
-            <xml-root-element name="ctag-assignment" />
+            <xml-root-element name="ctag-assignment"/>
             <java-attributes>
                 <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="id." />
+                        <xml-property name="description" value="id."/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="vlan-id-inner" />
-                <xml-property name="dependentOn" value="l3-network" />
-                <xml-property name="container" value="ctag-assignments" />
+                <xml-property name="indexedProps" value="vlan-id-inner"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="ctag-assignments"/>
+                <xml-property name="uriTemplate" value="/ctag-assignments/ctag-assignment/{vlan-id-inner}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Subnets">
-            <xml-root-element name="subnets" />
+            <xml-root-element name="subnets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v10.Subnet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v10.Subnet"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Subnet">
-            <xml-root-element name="subnet" />
+            <xml-root-element name="subnet"/>
             <java-attributes>
                 <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Subnet ID, should be UUID." />
+                        <xml-property name="description" value="Subnet ID, should be UUID."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name associated with the subnet." />
+                        <xml-property name="description" value="Name associated with the subnet."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of this subnet" />
+                        <xml-property name="description" value="Neutron id of this subnet"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="gateway ip address" />
+                        <xml-property name="description" value="gateway ip address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="network start address" />
+                        <xml-property name="description" value="network start address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="cidr mask" />
+                        <xml-property name="description" value="cidr mask"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ip version" />
+                        <xml-property name="description" value="ip version"/>
                     </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, mastered by MSO" />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="dhcpEnabled" name="dhcp-enabled" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="dhcp enabled" />
+                        <xml-property name="description" value="dhcp enabled"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the start address reserved for use by dhcp" />
+                        <xml-property name="description" value="the start address reserved for use by dhcp"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the last address reserved for use by dhcp" />
+                        <xml-property name="description" value="the last address reserved for use by dhcp"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="subnet-id,subnet-name" />
-                <xml-property name="nameProps" value="subnet-name" />
-                <xml-property name="uniqueProps" value="subnet-id" />
-                <xml-property name="dependentOn" value="l3-network" />
-                <xml-property name="container" value="subnets" />
+                <xml-property name="indexedProps" value="subnet-id,subnet-name"/>
+                <xml-property name="nameProps" value="subnet-name"/>
+                <xml-property name="uniqueProps" value="subnet-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="subnets"/>
+                <xml-property name="uriTemplate" value="/subnets/subnet/{subnet-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="GenericVnfs">
             <xml-properties>
-                <xml-property name="description" value="Collection of VNFs" />
+                <xml-property name="description" value="Collection of VNFs"/>
             </xml-properties>
-            <xml-root-element name="generic-vnfs" />
+            <xml-root-element name="generic-vnfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v10.GenericVnf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v10.GenericVnf"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="GenericVnf">
-            <xml-root-element name="generic-vnf" />
+            <xml-root-element name="generic-vnf"/>
             <java-attributes>
                 <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                        <xml-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-element java-attribute="vnfName" name="vnf-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of VNF." />
+                        <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-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-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-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-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-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                         <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalStatus" name="operational-status" 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-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-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-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-property name="description" value="Orchestration status of this VNF, used by MSO."/>
                         <xml-property name="suggestibleOnSearch" value="true"/>
                     </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-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-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 company or customer" />
+                        <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-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-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-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-property name="description" value="v6 management address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
@@ -3600,661 +3646,667 @@
                         <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only in some usecases" />
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                <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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                        <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-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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-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-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-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-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-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-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-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-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="requires" value="model-version-id" />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
                         <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </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-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="captures the id of all the configuration used to customize the resource for the service." />
+                        <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-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-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-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-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-property name="suggestibleOnSearch" value="true"/>
+                        <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-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-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-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-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
-                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v10.VfModules" />
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v10.Licenses" />
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v10.Entitlements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces"/>
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v10.VfModules"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v10.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v10.Entitlements"/>
             </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,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="namespace" value="network" />
-                <xml-property name="extends" value="vnf" />
+                <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,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="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
                 <xml-property name="containsSuggestibleProps" value="true"/>
                 <xml-property name="suggestionAliases" value="VNFs"/>
+                <xml-property name="uriTemplate" value="/network/generic-vnfs/generic-vnf/{vnf-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="VfModules">
             <xml-properties>
-                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
+                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs"/>
             </xml-properties>
-            <xml-root-element name="vf-modules" />
+            <xml-root-element name="vf-modules"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v10.VfModule" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v10.VfModule"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VfModule">
-            <xml-root-element name="vf-module" />
+            <xml-root-element name="vf-module"/>
             <java-attributes>
                 <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of vf-module." />
+                        <xml-property name="description" value="Unique ID of vf-module."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of vf-module" />
+                        <xml-property name="description" value="Name of vf-module"/>
                     </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." />
+                        <xml-property name="description" value="Heat stack id corresponding to this instance."/>
                     </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 vf-module, mastered by MSO" />
+                        <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="isBaseVfModule" name="is-base-vf-module" 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 base vf module" />
+                        <xml-property name="description" value="used to indicate whether or not this object is base vf module"/>
                     </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-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="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="requires" value="model-version-id" />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
                         <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </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-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="captures the id of all the configuration used to customize the resource for the service." />
+                        <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-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-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="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the Contrail unique ID for a service-instance" />
+                        <xml-property name="description" value="the Contrail unique ID for a service-instance"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" />
+                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit"/>
                     </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-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </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,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-property name="description" value="a deployment unit of VNFCs"/>
+                <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-property name="uriTemplate" value="/vf-modules/vf-module/{vf-module-id}"/>
             </xml-properties>
         </java-type>
 
 
         <java-type name="LagLinks">
             <xml-properties>
-                <xml-property name="description" value="Collection of link aggregation connections" />
+                <xml-property name="description" value="Collection of link aggregation connections"/>
             </xml-properties>
-            <xml-root-element name="lag-links" />
+            <xml-root-element name="lag-links"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v10.LagLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v10.LagLink"/>
             </java-attributes>
         </java-type>
 
         <java-type name="LagLink">
-            <xml-root-element name="lag-link" />
+            <xml-root-element name="lag-link"/>
             <java-attributes>
                 <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
+                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="LAG links can connect lag-interfaces" />
-                <xml-property name="indexedProps" value="link-name" />
-                <xml-property name="container" value="lag-links" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="LAG links can connect lag-interfaces"/>
+                <xml-property name="indexedProps" value="link-name"/>
+                <xml-property name="container" value="lag-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/lag-links/lag-link/{link-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Newvces">
             <xml-properties>
-                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
             </xml-properties>
-            <xml-root-element name="newvces" />
+            <xml-root-element name="newvces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v10.Newvce" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v10.Newvce"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Newvce">
-            <xml-root-element name="newvce" />
+            <xml-root-element name="newvce"/>
             <java-attributes>
                 <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
+                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of VNF." />
+                        <xml-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-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-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="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Client should send valid enumerated value." />
+                        <xml-property name="description" value="Client should send valid enumerated value."/>
                     </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-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="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v4 Loopback0 address" />
+                        <xml-property name="description" value="v4 Loopback0 address"/>
                     </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, mastered by MSO." />
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered 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-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-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-                <xml-property name="nameProps" value="vnf-name" />
-                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" />
-                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" />
-                <xml-property name="uniqueProps" value="vnf-id2" />
-                <xml-property name="container" value="newvces" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2"/>
+                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id2"/>
+                <xml-property name="container" value="newvces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/newvces/newvce/{vnf-id2}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Pnfs">
             <xml-properties>
-                <xml-property name="description" value="Collection of Physical Network Functions." />
+                <xml-property name="description" value="Collection of Physical Network Functions."/>
             </xml-properties>
-            <xml-root-element name="pnfs" />
+            <xml-root-element name="pnfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v10.Pnf" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v10.Pnf"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Pnf">
-            <xml-root-element name="pnf" />
+            <xml-root-element name="pnf"/>
             <java-attributes>
                 <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="unique name of Physical Network Function." />
+                        <xml-property name="description" value="unique name of Physical Network Function."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="name of Physical Network Function." />
+                        <xml-property name="description" value="name of Physical Network Function."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="source of name2" />
+                        <xml-property name="description" value="source of name2"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="id of pnf" />
+                        <xml-property name="description" value="id of pnf"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
                     </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 company or customer" />
+                        <xml-property name="description" value="identifier of managed by ATT or customer"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" />
+                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." />
+                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                <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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                        <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 java-attribute="frameId" name="frame-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." />
+                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Serial number of the device" />
+                        <xml-property name="description" value="Serial number of the device"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 Loopback 0 address" />
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 Loopback 0 address" />
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 AIM address" />
+                        <xml-property name="description" value="IPV4 AIM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 AIM address" />
+                        <xml-property name="description" value="IPV6 AIM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 OAM address" />
+                        <xml-property name="description" value="IPV6 OAM address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
                     </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-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="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
+                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" />
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
-                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status" />
-                <xml-property name="searchable" value="pnf-name" />
-                <xml-property name="uniqueProps" value="pnf-name" />
-                <xml-property name="container" value="pnfs" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
+                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status"/>
+                <xml-property name="searchable" value="pnf-name"/>
+                <xml-property name="uniqueProps" value="pnf-name"/>
+                <xml-property name="container" value="pnfs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/pnfs/pnf/{pnf-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="PhysicalLinks">
             <xml-properties>
-                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
             </xml-properties>
-            <xml-root-element name="physical-links" />
+            <xml-root-element name="physical-links"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v10.PhysicalLink" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v10.PhysicalLink"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0" />
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
         <java-type name="PhysicalLink">
-            <xml-root-element name="physical-link" />
+            <xml-root-element name="physical-link"/>
             <java-attributes>
                 <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
+                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Circuit it" />
+                        <xml-property name="description" value="Circuit it"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary" />
+                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider" />
+                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the service Provider on this link." />
+                        <xml-property name="description" value="Name of the service Provider on this link."/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
-                <xml-property name="indexedProps" value="circuit-id,link-name" />
-                <xml-property name="alternateKeys1" value="circuit-id" />
-                <xml-property name="container" value="physical-links" />
-                <xml-property name="namespace" value="network" />
-                <xml-property name="searchable" value="link-name,circuit-id" />
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+                <xml-property name="indexedProps" value="circuit-id,link-name"/>
+                <xml-property name="alternateKeys1" value="circuit-id"/>
+                <xml-property name="container" value="physical-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="searchable" value="link-name,circuit-id"/>
+                <xml-property name="uriTemplate" value="/network/physical-links/physical-link/{link-name}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="VigServers">
-            <xml-root-element name="vig-servers" />
+            <xml-root-element name="vig-servers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v10.VigServer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v10.VigServer"/>
             </java-attributes>
         </java-type>
 
         <java-type name="VigServer">
-            <xml-root-element name="vig-server" />
+            <xml-root-element name="vig-server"/>
             <java-attributes>
                 <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" />
+                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" >
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v4 IP of the vig server" />
+                        <xml-property name="description" value="v4 IP of the vig server"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" >
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v6 IP of the vig server" />
+                        <xml-property name="description" value="v6 IP of the vig server"/>
                     </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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
-                <xml-property name="indexedProps" value="vig-address-type" />
-                <xml-property name="dependentOn" value="ipsec-configuration" />
-                <xml-property name="container" value="vig-servers" />
+                <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607"/>
+                <xml-property name="indexedProps" value="vig-address-type"/>
+                <xml-property name="dependentOn" value="ipsec-configuration"/>
+                <xml-property name="container" value="vig-servers"/>
+                <xml-property name="uriTemplate" value="/vig-servers/vig-server/{vig-address-type}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="IpsecConfigurations">
-            <xml-root-element name="ipsec-configurations" />
+            <xml-root-element name="ipsec-configurations"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v10.IpsecConfiguration" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v10.IpsecConfiguration"/>
             </java-attributes>
         </java-type>
 
         <java-type name="IpsecConfiguration">
-            <xml-root-element name="ipsec-configuration" />
+            <xml-root-element name="ipsec-configuration"/>
             <java-attributes>
                 <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID of this configuration" />
+                        <xml-property name="description" value="UUID of this configuration"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" />
+                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
@@ -4264,1072 +4316,1091 @@
                 </xml-element>
                 <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Network address of shared DMZ" />
+                        <xml-property name="description" value="Network address of shared DMZ"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" />
+                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="can be 1 or 2" />
+                        <xml-property name="description" value="can be 1 or 2"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" />
+                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384"/>
                     </xml-properties>
                 </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-properties>
-                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" />
+                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" />
+                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="pre-shared key for the above group name " />
+                        <xml-property name="description" value="pre-shared key for the above group name "/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Lifetime for IKEv1 SA" />
+                        <xml-property name="description" value="Lifetime for IKEv1 SA"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="md5, sha1, sha256, sha384" />
+                        <xml-property name="description" value="md5, sha1, sha256, sha384"/>
                     </xml-properties>
                 </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-properties>
-                        <xml-property name="description" value="Life time for IPSec SA" />
+                        <xml-property name="description" value="Life time for IPSec SA"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="enable PFS or not" />
+                        <xml-property name="description" value="enable PFS or not"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="user ID for xAuth, sm-user, ,nmteHostName" />
+                        <xml-property name="description" value="user ID for xAuth, sm-user,nmteHostName"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" />
+                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The time between DPD probe" />
+                        <xml-property name="description" value="The time between DPD probe"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" />
+                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down"/>
                     </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-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.v10.RelationshipList" />
-                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v10.VigServers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v10.VigServers"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
-                <xml-property name="indexedProps" value="ipsec-configuration-id" />
-                <xml-property name="uniqueProps" value="ipsec-configuration-id" />
-                <xml-property name="container" value="ipsec-configurations" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
+                <xml-property name="indexedProps" value="ipsec-configuration-id"/>
+                <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
+                <xml-property name="container" value="ipsec-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}"/>
             </xml-properties>
         </java-type>
 
 
         <java-type name="NotificationEvent">
-            <xml-root-element name="notification-event" />
+            <xml-root-element name="notification-event"/>
             <java-attributes>
-                <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" />
-                <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v10.NotificationEventHeader" />
-                <xml-any-element java-attribute="entity" />
+                <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String"/>
+                <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v10.NotificationEventHeader"/>
+                <xml-any-element java-attribute="entity"/>
             </java-attributes>
         </java-type>
         <java-type name="NotificationEventHeader">
-            <xml-root-element name="notification-event-header" />
-            <java-attributes>
-                <xml-element java-attribute="id" name="id" type="java.lang.String" />
-                <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" />
-                <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" />
-                <xml-element java-attribute="domain" name="domain" type="java.lang.String" />
-                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" />
-                <xml-element java-attribute="severity" name="severity" type="java.lang.String" />
-                <xml-element java-attribute="eventType" name="event-type" type="java.lang.String" />
-                <xml-element java-attribute="version" name="version" type="java.lang.String" />
-                <xml-element java-attribute="action" name="action" type="java.lang.String" />
-                <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" />
-                <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" />
-                <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" />
-                <xml-element java-attribute="status" name="status" type="java.lang.String" />
+            <xml-root-element name="notification-event-header"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" type="java.lang.String"/>
+                <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String"/>
+                <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String"/>
+                <xml-element java-attribute="domain" name="domain" type="java.lang.String"/>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String"/>
+                <xml-element java-attribute="severity" name="severity" type="java.lang.String"/>
+                <xml-element java-attribute="eventType" name="event-type" type="java.lang.String"/>
+                <xml-element java-attribute="version" name="version" type="java.lang.String"/>
+                <xml-element java-attribute="action" name="action" type="java.lang.String"/>
+                <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String"/>
+                <xml-element java-attribute="status" name="status" type="java.lang.String"/>
             </java-attributes>
         </java-type>
         <java-type name="AaiInternal">
-            <xml-root-element name="aai-internal" />
+            <xml-root-element name="aai-internal"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v10.ReservedPropNames" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v10.EdgePropNames" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v10.ReservedPropNames"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v10.EdgePropNames"/>
             </java-attributes>
         </java-type>
         <java-type name="ReservedPropNames">
             <xml-properties>
-                <xml-property name="description" value="Internal map to define some reserved properties of a vertex" />
-                <xml-property name="uniqueProps" value="aai-unique-key" />
-                <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri" />
+                <xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
+                <xml-property name="uniqueProps" value="aai-unique-key"/>
+                <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
             </xml-properties>
-            <xml-root-element name="reserved-prop-names" />
+            <xml-root-element name="reserved-prop-names"/>
             <java-attributes>
-                <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" />
-                <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String" />
-                <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" />
-                <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" />
-                <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" />
-                <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" />
-                <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String" />
+                <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String"/>
+                <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long"/>
+                <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String"/>
+                <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long"/>
+                <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String"/>
+                <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String"/>
             </java-attributes>
         </java-type>
         <java-type name="EdgePropNames">
             <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
             <xml-properties>
-                <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" />
-                <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
+                <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules"/>
+                <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV"/>
             </xml-properties>
-            <xml-root-element name="edge-prop-names" />
+            <xml-root-element name="edge-prop-names"/>
             <java-attributes>
-                <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
-                <xml-element java-attribute="direction" name="direction" type="java.lang.String" />
-                <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
-                <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean" />
-                <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-                <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-                <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.Boolean" />
-                <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.Boolean" />
+                <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String"/>
+                <xml-element java-attribute="direction" name="direction" type="java.lang.String"/>
+                <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String"/>
+                <xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String"/>
+                <xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String"/>
+                <xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String"/>
+                <xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Models">
             <xml-properties>
-                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" />
+                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models"/>
             </xml-properties>
-            <xml-root-element name="models" />
+            <xml-root-element name="models"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v10.Model" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v10.Model"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Model">
-            <xml-root-element name="model" />
+            <xml-root-element name="model"/>
             <xml-properties>
-                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version" />
-                <xml-property name="nameProps" value="model-type" />
-                <xml-property name="indexedProps" value="model-invariant-id,model-type" />
-                <xml-property name="uniqueProps" value="model-invariant-id" />
-                <xml-property name="container" value="models" />
-                <xml-property name="namespace" value="service-design-and-creation" />
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version"/>
+                <xml-property name="nameProps" value="model-type"/>
+                <xml-property name="indexedProps" value="model-invariant-id,model-type"/>
+                <xml-property name="uniqueProps" value="model-invariant-id"/>
+                <xml-property name="container" value="models"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/models/model/{model-invariant-id}"/>
             </xml-properties>
             <java-attributes>
                 <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
                     </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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v10.ModelVers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v10.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
         </java-type>
 
 
         <java-type name="ModelVers">
-            <xml-root-element name="model-vers" />
+            <xml-root-element name="model-vers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v10.ModelVer" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v10.ModelVer"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelVer">
-            <xml-root-element name="model-ver" />
+            <xml-root-element name="model-ver"/>
             <xml-properties>
-                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" />
-                <xml-property name="nameProps" value="model-name" />
-                <xml-property name="indexedProps" value="model-version-id,model-name,model-version" />
-                <xml-property name="uniqueProps" value="model-version-id" />
-                <xml-property name="container" value="model-vers" />
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models"/>
+                <xml-property name="nameProps" value="model-name"/>
+                <xml-property name="indexedProps" value="model-version-id,model-name,model-version"/>
+                <xml-property name="uniqueProps" value="model-version-id"/>
+                <xml-property name="container" value="model-vers"/>
+                <xml-property name="uriTemplate" value="/model-vers/model-ver/{model-version-id}"/>
             </xml-properties>
             <java-attributes>
                 <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the model, which can change from version to version." />
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Version" />
+                        <xml-property name="description" value="Version"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description" />
+                        <xml-property name="description" value="Description"/>
                     </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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements" />
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelElements">
-            <xml-root-element name="model-elements" />
+            <xml-root-element name="model-elements"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v10.ModelElement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v10.ModelElement"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelElement">
             <xml-properties>
-                <xml-property name="description" value="Defines how other models combine to make up a higher-level model." />
-                <xml-property name="uniqueProps" value="model-element-uuid" />
-                <xml-property name="indexedProps" value="model-element-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="model-elements" />
+                <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
+                <xml-property name="uniqueProps" value="model-element-uuid"/>
+                <xml-property name="indexedProps" value="model-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-elements"/>
+                <xml-property name="uriTemplate" value="/model-elements/model-element/{model-element-uuid}"/>
             </xml-properties>
-            <xml-root-element name="model-element" />
+            <xml-root-element name="model-element"/>
             <java-attributes>
                 <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" />
+                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="How many of this type of element are required/allowed" />
+                        <xml-property name="description" value="How many of this type of element are required/allowed"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" >
+                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String">
                 </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="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements">
                     <xml-properties>
-                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
+                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v10.ModelConstraints">
                     <xml-properties>
-                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
+                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelConstraints">
-            <xml-root-element name="model-constraints" />
+            <xml-root-element name="model-constraints"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v10.ModelConstraint" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v10.ModelConstraint"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelConstraint">
             <xml-properties>
-                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-                <xml-property name="uniqueProps" value="model-constraint-uuid" />
-                <xml-property name="indexedProps" value="model-constraint-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="model-constraints" />
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="model-constraint-uuid"/>
+                <xml-property name="indexedProps" value="model-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-constraints"/>
+                <xml-property name="uriTemplate" value="/model-constraints/model-constraint/{model-constraint-uuid}"/>
             </xml-properties>
-            <xml-root-element name="model-constraint" />
+            <xml-root-element name="model-constraint"/>
             <java-attributes>
                 <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v10.ConstrainedElementSets" />
+                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v10.ConstrainedElementSets"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
         </java-type>
 
         <java-type name="ConstrainedElementSets">
-            <xml-root-element name="constrained-element-sets" />
+            <xml-root-element name="constrained-element-sets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v10.ConstrainedElementSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v10.ConstrainedElementSet"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ConstrainedElementSet">
             <xml-properties>
-                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-                <xml-property name="uniqueProps" value="constrained-element-set-uuid" />
-                <xml-property name="indexedProps" value="constrained-element-set-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="constrained-element-sets" />
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
+                <xml-property name="indexedProps" value="constrained-element-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="constrained-element-sets"/>
+                <xml-property name="uriTemplate" value="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}"/>
             </xml-properties>
-            <xml-root-element name="constrained-element-set" />
+            <xml-root-element name="constrained-element-set"/>
             <java-attributes>
                 <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v10.ElementChoiceSets" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v10.ElementChoiceSets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ElementChoiceSets">
-            <xml-root-element name="element-choice-sets" />
+            <xml-root-element name="element-choice-sets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v10.ElementChoiceSet" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v10.ElementChoiceSet"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ElementChoiceSet">
             <xml-properties>
-                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-                <xml-property name="uniqueProps" value="element-choice-set-uuid" />
-                <xml-property name="indexedProps" value="element-choice-set-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="element-choice-sets" />
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
+                <xml-property name="indexedProps" value="element-choice-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="element-choice-sets"/>
+                <xml-property name="uriTemplate" value="/element-choice-sets/element-choice-set/{element-choice-set-uuid}"/>
             </xml-properties>
-            <xml-root-element name="element-choice-set" />
+            <xml-root-element name="element-choice-set"/>
             <java-attributes>
                 <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
-                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="NamedQueries">
-            <xml-root-element name="named-queries" />
+            <xml-root-element name="named-queries"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v10.NamedQuery" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v10.NamedQuery"/>
             </java-attributes>
         </java-type>
 
         <java-type name="NamedQuery">
             <xml-properties>
-                <xml-property name="description" value="TBD" />
-                <xml-property name="nameProps" value="named-query-name" />
-                <xml-property name="uniqueProps" value="named-query-uuid" />
-                <xml-property name="indexedProps" value="named-query-uuid,named-query-name" />
-                <xml-property name="container" value="named-queries" />
-                <xml-property name="namespace" value="service-design-and-creation" />
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="nameProps" value="named-query-name"/>
+                <xml-property name="uniqueProps" value="named-query-uuid"/>
+                <xml-property name="indexedProps" value="named-query-uuid,named-query-name"/>
+                <xml-property name="container" value="named-queries"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/named-queries/named-query/{named-query-uuid}"/>
             </xml-properties>
-            <xml-root-element name="named-query" />
+            <xml-root-element name="named-query"/>
             <java-attributes>
-                <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" />
-                <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
-                <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String" >
-                    <xml-element-wrapper name="required-input-params" />
+                <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String">
+                    <xml-element-wrapper name="required-input-params"/>
                 </xml-element>
-                <xml-element java-attribute="description" name="description" type="java.lang.String" />
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v10.NamedQueryElements" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="description" name="description" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v10.NamedQueryElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="NamedQueryElements">
-            <xml-root-element name="named-query-elements" />
+            <xml-root-element name="named-query-elements"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v10.NamedQueryElement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v10.NamedQueryElement"/>
             </java-attributes>
         </java-type>
 
         <java-type name="NamedQueryElement">
             <xml-properties>
-                <xml-property name="description" value="TBD" />
-                <xml-property name="uniqueProps" value="named-query-element-uuid" />
-                <xml-property name="indexedProps" value="named-query-element-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="named-query-elements" />
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="named-query-element-uuid"/>
+                <xml-property name="indexedProps" value="named-query-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="named-query-elements"/>
+                <xml-property name="uriTemplate" value="/named-query-elements/named-query-element/{named-query-element-uuid}"/>
             </xml-properties>
-            <xml-root-element name="named-query-element" />
+            <xml-root-element name="named-query-element"/>
             <java-attributes>
                 <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
-                <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
-                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v10.NamedQueryElements" />
-                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v10.RelatedLookups" />
-                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v10.PropertyConstraints" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String"/>
+                <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v10.NamedQueryElements"/>
+                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v10.RelatedLookups"/>
+                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v10.PropertyConstraints"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RelatedLookups">
-            <xml-root-element name="related-lookups" />
+            <xml-root-element name="related-lookups"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v10.RelatedLookup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v10.RelatedLookup"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RelatedLookup">
             <xml-properties>
-                <xml-property name="description" value="TBD" />
-                <xml-property name="uniqueProps" value="related-lookup-uuid" />
-                <xml-property name="indexedProps" value="related-lookup-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="related-lookups" />
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="related-lookup-uuid"/>
+                <xml-property name="indexedProps" value="related-lookup-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="related-lookups"/>
+                <xml-property name="uriTemplate" value="/related-lookups/related-lookup/{related-lookup-uuid}"/>
             </xml-properties>
-            <xml-root-element name="related-lookup" />
+            <xml-root-element name="related-lookup"/>
             <java-attributes>
                 <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String" />
-                <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" />
-                <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" />
-                <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="PropertyConstraints">
-            <xml-root-element name="property-constraints" />
+            <xml-root-element name="property-constraints"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v10.PropertyConstraint" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v10.PropertyConstraint"/>
             </java-attributes>
         </java-type>
 
         <java-type name="PropertyConstraint">
             <xml-properties>
-                <xml-property name="description" value="TBD" />
-                <xml-property name="uniqueProps" value="property-constraint-uuid" />
-                <xml-property name="indexedProps" value="property-constraint-uuid" />
-                <xml-property name="allowDirectRead" value="true" />
-                <xml-property name="allowDirectWrite" value="false" />
-                <xml-property name="container" value="property-constraints" />
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="property-constraint-uuid"/>
+                <xml-property name="indexedProps" value="property-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="property-constraints"/>
+                <xml-property name="uriTemplate" value="/property-constraints/property-constraint/{property-constraint-uuid}"/>
             </xml-properties>
-            <xml-root-element name="property-constraint" />
+            <xml-root-element name="property-constraint"/>
             <java-attributes>
                 <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true" />
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-                <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" />
-                <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String" />
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ModelAndNamedQuerySearch">
             <xml-properties>
-                <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query" />
+                <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query"/>
             </xml-properties>
-            <xml-root-element name="model-and-named-query-search" />
+            <xml-root-element name="model-and-named-query-search"/>
             <java-attributes>
-                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v10.QueryParameters" />
-                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v10.InstanceFilters" />
-                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v10.SecondaryFilts" />
-                <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" />
-                <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" />
+                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v10.QueryParameters"/>
+                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v10.InstanceFilters"/>
+                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v10.SecondaryFilts"/>
+                <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="QueryParameters">
             <xml-properties>
-                <xml-property name="description" value="QueryParameters for performing a named-query or model query" />
+                <xml-property name="description" value="QueryParameters for performing a named-query or model query"/>
             </xml-properties>
-            <xml-root-element name="query-parameters" />
+            <xml-root-element name="query-parameters"/>
             <java-attributes>
-                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v10.NamedQuery" />
-                <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v10.OverloadedModel" />
+                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v10.NamedQuery"/>
+                <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v10.OverloadedModel"/>
             </java-attributes>
         </java-type>
 
         <java-type name="OverloadedModel">
-            <xml-root-element name="overloaded-model" />
+            <xml-root-element name="overloaded-model"/>
             <xml-properties>
-                <xml-property name="description" value="Allows for legacy POST of old-style and new-style models" />
+                <xml-property name="description" value="Allows for legacy POST of old-style and new-style models"/>
             </xml-properties>
             <java-attributes>
                 <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the model, which can change from version to version." />
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Invariant unique ID which does not change from version to version" />
+                        <xml-property name="description" value="Invariant unique ID which does not change from version to version"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Version" />
+                        <xml-property name="description" value="Version"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description" />
+                        <xml-property name="description" value="Description"/>
                     </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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v10.ModelVers" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v10.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
         </java-type>
 
         <java-type name="InstanceFilters">
             <xml-properties>
-                <xml-property name="description" value="InstanceFilters for performing a named-query or model query" />
+                <xml-property name="description" value="InstanceFilters for performing a named-query or model query"/>
             </xml-properties>
-            <xml-root-element name="instance-filters" />
+            <xml-root-element name="instance-filters"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v10.InstanceFilter" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v10.InstanceFilter"/>
             </java-attributes>
         </java-type>
 
         <java-type name="InstanceFilter">
             <xml-properties>
-                <xml-property name="description" value="InstanceFilter for performing a named-query or model query" />
-                <xml-property name="container" value="instance-filters" />
+                <xml-property name="description" value="InstanceFilter for performing a named-query or model query"/>
+                <xml-property name="container" value="instance-filters"/>
             </xml-properties>
-            <xml-root-element name="instance-filter" />
+            <xml-root-element name="instance-filter"/>
             <java-attributes>
-                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
+                <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-property name="description" value="SecondaryFilts for performing a named-query or model query"/>
             </xml-properties>
-            <xml-root-element name="secondary-filts" />
+            <xml-root-element name="secondary-filts"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v10.SecondaryFilt" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v10.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-property name="description" value="SecondaryFilt for performing a named-query or model query"/>
             </xml-properties>
-            <xml-root-element name="secondary-filt" />
+            <xml-root-element name="secondary-filt"/>
             <java-attributes>
-                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
+                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Properties">
             <xml-properties>
-                <xml-property name="description" value="Property holder for query properties or instance properties" />
+                <xml-property name="description" value="Property holder for query properties or instance properties"/>
             </xml-properties>
-            <xml-root-element name="properties" />
+            <xml-root-element name="properties"/>
             <java-attributes>
-                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ResponseList">
             <xml-properties>
-                <xml-property name="description" value="Response container for the results of a named-query or model query" />
+                <xml-property name="description" value="Response container for the results of a named-query or model query"/>
             </xml-properties>
-            <xml-root-element name="response-list" />
+            <xml-root-element name="response-list"/>
             <java-attributes>
-                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v10.InventoryResponseItems" />
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v10.InventoryResponseItems"/>
             </java-attributes>
         </java-type>
 
         <java-type name="InventoryResponseItems">
             <xml-properties>
-                <xml-property name="description" value="Container for inventory items in response list" />
-                <xml-property name="container" value="response-list" />
+                <xml-property name="description" value="Container for inventory items in response list"/>
+                <xml-property name="container" value="response-list"/>
             </xml-properties>
-            <xml-root-element name="inventory-response-items" />
+            <xml-root-element name="inventory-response-items"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v10.InventoryResponseItem" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v10.InventoryResponseItem"/>
             </java-attributes>
         </java-type>
 
         <java-type name="InventoryResponseItem">
             <xml-properties>
-                <xml-property name="description" value="Inventory item for response list" />
-                <xml-property name="container" value="inventory-response-items" />
+                <xml-property name="description" value="Inventory item for response list"/>
+                <xml-property name="container" value="inventory-response-items"/>
             </xml-properties>
-            <xml-root-element name="inventory-response-item" />
+            <xml-root-element name="inventory-response-item"/>
             <java-attributes>
-                <xml-element java-attribute="modelName" name="model-name" type="java.lang.String" />
-                <xml-any-element java-attribute="item" />
-                <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v10.ExtraProperties" />
-                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v10.InventoryResponseItems" />
+                <xml-element java-attribute="modelName" name="model-name" type="java.lang.String"/>
+                <xml-any-element java-attribute="item"/>
+                <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v10.ExtraProperties"/>
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v10.InventoryResponseItems"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ExtraProperties">
             <xml-properties>
-                <xml-property name="description" value="Extra properties for inventory item for response list" />
+                <xml-property name="description" value="Extra properties for inventory item for response list"/>
             </xml-properties>
-            <xml-root-element name="extra-properties" />
+            <xml-root-element name="extra-properties"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v10.ExtraProperty" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v10.ExtraProperty"/>
             </java-attributes>
         </java-type>
 
         <java-type name="ExtraProperty">
-            <xml-root-element name="extra-property" />
+            <xml-root-element name="extra-property"/>
             <java-attributes>
-                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RouteTableReferences">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack route table references" />
+                <xml-property name="description" value="Collection of openstack route table references"/>
             </xml-properties>
-            <xml-root-element name="route-table-references" />
+            <xml-root-element name="route-table-references"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v10.RouteTableReference" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v10.RouteTableReference"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RouteTableReference">
-            <xml-root-element name="route-table-reference" />
+            <xml-root-element name="route-table-reference"/>
             <java-attributes>
                 <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="FQDN entry in the route table." />
+                        <xml-property name="description" value="FQDN entry in the route table."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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="uniqueProps" value="route-table-reference-id" />
-                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" />
-                <xml-property name="container" value="route-table-references" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="Openstack route table reference."/>
+                <xml-property name="nameProps" value="route-table-reference-fqdn"/>
+                <xml-property name="uniqueProps" value="route-table-reference-id"/>
+                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+                <xml-property name="container" value="route-table-references"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/route-table-references/route-table-reference/{route-table-reference-id}"/>
             </xml-properties>
         </java-type>
 
         <java-type name="InstanceGroups">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack route table references" />
+                <xml-property name="description" value="Collection of openstack route table references"/>
             </xml-properties>
-            <xml-root-element name="instance-groups" />
+            <xml-root-element name="instance-groups"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v10.InstanceGroup" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v10.InstanceGroup"/>
             </java-attributes>
         </java-type>
 
         <java-type name="InstanceGroup">
-            <xml-root-element name="instance-group" />
+            <xml-root-element name="instance-group"/>
             <java-attributes>
                 <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
+                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" />
+                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Only valid value today is lower case ha for high availability" />
+                        <xml-property name="description" value="Only valid value today is lower case ha for high availability"/>
+                        <xml-property name="dbAlias" value="instance-group-type"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subType" name="sub-type"  type="java.lang.String">
+                <xml-element java-attribute="subType" name="sub-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]" />
+                        <xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
 
             <xml-properties>
-                <xml-property name="description" value="General mechanism for grouping instances" />
-                <xml-property name="nameProps" value="description" />
-                <xml-property name="uniqueProps" value="id" />
-                <xml-property name="indexedProps" value="id,description,type,sub-type" />
-                <xml-property name="container" value="instance-groups" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="General mechanism for grouping instances"/>
+                <xml-property name="nameProps" value="description"/>
+                <xml-property name="uniqueProps" value="id"/>
+                <xml-property name="searchable" value="id,description"/>
+                <xml-property name="indexedProps" value="id,description,type,sub-type"/>
+                <xml-property name="container" value="instance-groups"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
             </xml-properties>
         </java-type>
 
 
         <java-type name="SegmentationAssignments">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack segmentation assignments" />
+                <xml-property name="description" value="Collection of openstack segmentation assignments"/>
             </xml-properties>
-            <xml-root-element name="segmentation-assignments" />
+            <xml-root-element name="segmentation-assignments"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v10.SegmentationAssignment" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v10.SegmentationAssignment"/>
             </java-attributes>
         </java-type>
 
         <java-type name="SegmentationAssignment">
-            <xml-root-element name="segmentation-assignment" />
+            <xml-root-element name="segmentation-assignment"/>
             <java-attributes>
                 <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack segmentation assignment." />
-                <xml-property name="indexedProps" value="segmentation-id" />
-                <xml-property name="dependentOn" value="l3-network" />
-                <xml-property name="container" value="segmentation-assignments" />
+                <xml-property name="description" value="Openstack segmentation assignment."/>
+                <xml-property name="indexedProps" value="segmentation-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="segmentation-assignments"/>
+                <xml-property name="uriTemplate" value="/segmentation-assignments/segmentation-assignment/{segmentation-id}"/>
             </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-property name="description" value="This object is used to store slices of services being offered"/>
             </xml-properties>
-            <xml-root-element name="allotted-resources" />
+            <xml-root-element name="allotted-resources"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v10.AllottedResource" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v10.AllottedResource"/>
             </java-attributes>
         </java-type>
 
         <java-type name="AllottedResource">
-            <xml-root-element name="allotted-resource" />
+            <xml-root-element name="allotted-resource"/>
             <java-attributes>
                 <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="description" name="description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance" />
+                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Link back to more information in the controller" />
+                        <xml-property name="description" value="Link back to more information in the controller"/>
                     </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="requires" value="model-version-id" />
-                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id" />
-                        <xml-property name="dbAlias" value="model-version-id-local" />
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
                         <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </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-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-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency 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" />
+                        <xml-property name="description" value="Orchestration status"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="type" name="type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Generic description of the type of allotted resource." />
+                        <xml-property name="description" value="Generic description of the type of allotted resource."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="role" name="role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="role in the network that this resource will be providing." />
+                        <xml-property name="description" value="role in the network that this resource will be providing."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v10.TunnelXconnects" />
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v10.TunnelXconnects"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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,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="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,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-property name="uriTemplate" value="/allotted-resources/allotted-resource/{id}"/>
             </xml-properties>
         </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-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource"/>
             </xml-properties>
-            <xml-root-element name="tunnel-xconnects" />
+            <xml-root-element name="tunnel-xconnects"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v10.TunnelXconnect" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v10.TunnelXconnect"/>
             </java-attributes>
         </java-type>
 
         <java-type name="TunnelXconnect">
-            <xml-root-element name="tunnel-xconnect" />
+            <xml-root-element name="tunnel-xconnect"/>
             <java-attributes>
                 <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The WAN uplink bandwidth for WAN1" />
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN1"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The WAN downlink bandwidth for WAN1" />
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN1"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The WAN uplink bandwidth for WAN2" />
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN2"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The WAN downlink bandwidth for WAN2" />
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN2"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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="indexedProps" value="id" />
-                <xml-property name="dependentOn" value="allotted-resource" />
-                <xml-property name="container" value="tunnel-xconnects" />
+                <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="indexedProps" value="id"/>
+                <xml-property name="dependentOn" value="allotted-resource"/>
+                <xml-property name="container" value="tunnel-xconnects"/>
                 <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/tunnel-xconnects/tunnel-xconnect/{id}"/>
             </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-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management"/>
             </xml-properties>
-            <xml-root-element name="entitlements" />
+            <xml-root-element name="entitlements"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v10.Entitlement" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v10.Entitlement"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Entitlement">
-            <xml-root-element name="entitlement" />
+            <xml-root-element name="entitlement"/>
             <java-attributes>
                 <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." />
+                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of an entitlement resource. " />
+                        <xml-property name="description" value="Unique ID of an entitlement resource. "/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </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" />
-                <xml-property name="container" value="entitlements" />
+                <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"/>
+                <xml-property name="container" value="entitlements"/>
+                <xml-property name="uriTemplate" value="/entitlements/entitlement/{group-uuid}/{resource-uuid}"/>
             </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-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management"/>
             </xml-properties>
-            <xml-root-element name="licenses" />
+            <xml-root-element name="licenses"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v10.License" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v10.License"/>
             </java-attributes>
         </java-type>
 
         <java-type name="License">
-            <xml-root-element name="license" />
+            <xml-root-element name="license"/>
             <java-attributes>
                 <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." />
+                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of a license resource. " />
+                        <xml-property name="description" value="Unique ID of a license resource. "/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </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" />
-                <xml-property name="container" value="licenses" />
+                <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"/>
+                <xml-property name="container" value="licenses"/>
+                <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
             </xml-properties>
         </java-type>
 
@@ -5338,107 +5409,109 @@
             <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-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Abstract vnf class" />
-                <xml-property name="indexedProps" value="vnf-id" />
-                <xml-property name="uniqueProps" value="vnf-id" />
-                <xml-property name="inheritors" value="vce,generic-vnf" />
-                <xml-property name="abstract" value="true" />
+                <xml-property name="description" value="Abstract vnf class"/>
+                <xml-property name="indexedProps" value="vnf-id"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="inheritors" value="vce,generic-vnf"/>
+                <xml-property name="abstract" value="true"/>
             </xml-properties>
         </java-type>
 
         <java-type name="Zones">
             <xml-properties>
-                <xml-property name="description" value="Collection of zones" />
+                <xml-property name="description" value="Collection of zones"/>
             </xml-properties>
-            <xml-root-element name="zones" />
+            <xml-root-element name="zones"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v10.Zone" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v10.Zone"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Zone">
-            <xml-root-element name="zone" />
+            <xml-root-element name="zone"/>
             <java-attributes>
                 <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Code assigned by AIC to the zone" />
+                        <xml-property name="description" value="Code assigned by AIC to the zone"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="English name associated with the zone" />
+                        <xml-property name="description" value="English name associated with the zone"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Design of zone [Medium/Large?]" />
+                        <xml-property name="description" value="Design of zone [Medium/Large…]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Context of zone [production/test]" />
+                        <xml-property name="description" value="Context of zone [production/test]"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="status" name="status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Status of a zone." />
+                        <xml-property name="description" value="Status of a zone."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value" />
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
-                <xml-property name="nameProps" value="zone-name" />
-                <xml-property name="indexedProps" value="zone-id,design-type,zone-context" />
-                <xml-property name="uniqueProps" value="zone-id" />
-                <xml-property name="container" value="zones" />
-                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB"/>
+                <xml-property name="nameProps" value="zone-name"/>
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context"/>
+                <xml-property name="uniqueProps" value="zone-id"/>
+                <xml-property name="container" value="zones"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
             </xml-properties>
         </java-type>
         <java-type name="RouteTargets">
             <xml-properties>
-                <xml-property name="description" value="Collection of route target information" />
+                <xml-property name="description" value="Collection of route target information"/>
             </xml-properties>
-            <xml-root-element name="route-targets" />
+            <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.v10.RouteTarget" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v10.RouteTarget"/>
             </java-attributes>
         </java-type>
         <java-type name="RouteTarget">
-            <xml-root-element name="route-target" />
+            <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-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Number used to identify an RT, globally unique in the network" />
+                        <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-element java-attribute="routeTargetRole" name="route-target-role" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Role assigned to this route target" />
+                        <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-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.v10.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Route target information" />
-                <xml-property name="container" value="route-targets" />
-                <xml-property name="dependentOn" value="vpn-binding" />
-                <xml-property name="canBeLinked" value="true" />
+                <xml-property name="description" value="Route target information"/>
+                <xml-property name="container" value="route-targets"/>
+                <xml-property name="dependentOn" value="vpn-binding"/>
+                <xml-property name="canBeLinked" value="true"/>
+                <xml-property name="uriTemplate" value="/route-targets/route-target/{global-route-target}/{route-target-role}"/>
             </xml-properties>
         </java-type>
     </java-types>
diff --git a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml
index 09ba1f11..92a09877 100644
--- a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml
@@ -23,211 +23,211 @@
 
 -->
 <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-schema element-form-default="QUALIFIED">
 		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11" />
-	</xml-schema>
-	<java-types>
-		<java-type name="Inventory">
-			<xml-root-element name="inventory" />
-			<java-attributes>
-				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.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-schema>
+    <java-types>
+        <java-type name="Inventory">
+            <xml-root-element name="inventory"/>
+            <java-attributes>
+                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.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="externalSystem" name="external-system" type="inventory.aai.onap.org.v11.ExternalSystem" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v11.AaiInternal" />
-				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v11.Nodes"/>
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Nodes">
-			<xml-root-element name="nodes" />
-		</java-type>
-		<java-type name="Search">
-			<xml-root-element name="search" />
-			<java-attributes>
-				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v11.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v11.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v11.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v11.SdnZoneResponse" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="EdgeTagQueryResult">
-			<xml-root-element name="edge-tag-query-result" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="TaggedInventoryItemList">
-			<xml-root-element name="tagged-inventory-item-list" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v11.InventoryItem" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="InventoryItem">
-			<xml-root-element name="inventory-item" />
-			<java-attributes>
-				<xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" />
-				<xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v11.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="InventoryItemData">
-			<xml-root-element name="inventory-item-data" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="EdgeTagQueryRequest">
-			<xml-root-element name="edge-tag-query-request" />
-			<java-attributes>
-				<xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" />
-				<xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" />
-				<xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v11.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v11.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v11.SecondaryFilter" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="StartNodeFilter">
-			<xml-root-element name="start-node-filter" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="IncludeNodeFilter">
-			<xml-root-element name="include-node-filter" />
-			<java-attributes>
-				<xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SecondaryFilter">
-			<xml-root-element name="secondary-filter" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="filterType" name="filter-type" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SearchResults">
-			<xml-root-element name="search-results" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v11.ResultData" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ResultData">
-			<xml-root-element name="result-data" />
-			<java-attributes>
-				<xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The specific type of node in the A&amp;AI graph" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The URL to the specific resource" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SdnZoneResponse">
-			<xml-root-element name="sdn-zone-response" />
-			<java-attributes>
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v11.AzAndDvsSwitches" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="AzAndDvsSwitches">
-			<xml-root-element name="az-and-dvs-switches" />
-			<java-attributes>
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Actions">
-			<xml-properties>
-				<xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)." />
-			</xml-properties>
-			<xml-root-element name="actions" />
-			<java-attributes>
-				<xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v11.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v11.Notify" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Update">
-			<xml-properties>
-				<xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team." />
-			</xml-properties>
-			<xml-root-element name="update" />
-			<java-attributes>
-				<xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v11.UpdateNodeKey" />
-				<xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v11.Action" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Action">
-			<xml-root-element name="action" />
-			<java-attributes>
-				<xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v11.ActionData" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ActionData">
-			<xml-root-element name="action-data" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="UpdateNodeKey">
-			<xml-root-element name="update-node-key" />
-			<java-attributes>
-				<xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
-				<xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Notify">
-			<xml-root-element name="notify" />
-			<java-attributes>
-				<xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" />
-				<xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" />
-				<xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v11.KeyData" />
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="KeyData">
-			<xml-root-element name="key-data" />
-			<java-attributes>
-				<xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
-				<xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business"/>
+                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation"/>
+                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network"/>
+                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v11.AaiInternal"/>
+                <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v11.Nodes"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Nodes">
+            <xml-root-element name="nodes"/>
+        </java-type>
+        <java-type name="Search">
+            <xml-root-element name="search"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v11.EdgeTagQueryResult"/>
+                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v11.EdgeTagQueryRequest"/>
+                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v11.SearchResults"/>
+                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v11.SdnZoneResponse"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="EdgeTagQueryResult">
+            <xml-root-element name="edge-tag-query-result"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="TaggedInventoryItemList">
+            <xml-root-element name="tagged-inventory-item-list"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v11.InventoryItem"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InventoryItem">
+            <xml-root-element name="inventory-item"/>
+            <java-attributes>
+                <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String"/>
+                <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v11.InventoryItemData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InventoryItemData">
+            <xml-root-element name="inventory-item-data"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="EdgeTagQueryRequest">
+            <xml-root-element name="edge-tag-query-request"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String"/>
+                <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String"/>
+                <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v11.StartNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v11.IncludeNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v11.SecondaryFilter"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="StartNodeFilter">
+            <xml-root-element name="start-node-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="IncludeNodeFilter">
+            <xml-root-element name="include-node-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SecondaryFilter">
+            <xml-root-element name="secondary-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SearchResults">
+            <xml-root-element name="search-results"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v11.ResultData"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ResultData">
+            <xml-root-element name="result-data"/>
+            <java-attributes>
+                <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The specific type of node in the A&amp;AI graph"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The URL to the specific resource"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SdnZoneResponse">
+            <xml-root-element name="sdn-zone-response"/>
+            <java-attributes>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v11.AzAndDvsSwitches"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AzAndDvsSwitches">
+            <xml-root-element name="az-and-dvs-switches"/>
+            <java-attributes>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches"/>
+                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Actions">
+            <xml-properties>
+                <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)."/>
+            </xml-properties>
+            <xml-root-element name="actions"/>
+            <java-attributes>
+                <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v11.Update"/>
+                <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v11.Notify"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Update">
+            <xml-properties>
+                <xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team."/>
+            </xml-properties>
+            <xml-root-element name="update"/>
+            <java-attributes>
+                <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v11.UpdateNodeKey"/>
+                <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v11.Action"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Action">
+            <xml-root-element name="action"/>
+            <java-attributes>
+                <xml-element java-attribute="actionType" name="action-type" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v11.ActionData"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ActionData">
+            <xml-root-element name="action-data"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="UpdateNodeKey">
+            <xml-root-element name="update-node-key"/>
+            <java-attributes>
+                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Notify">
+            <xml-root-element name="notify"/>
+            <java-attributes>
+                <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String"/>
+                <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v11.KeyData"/>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="KeyData">
+            <xml-root-element name="key-data"/>
+            <java-attributes>
+                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
 		<java-type name="ExternalSystem">
 			<xml-properties>
@@ -493,2107 +493,2139 @@
 			</xml-properties>
 		</java-type>
 
-		<java-type name="CloudInfrastructure">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for cloud infrastructure." />
-			</xml-properties>
-			<xml-root-element name="cloud-infrastructure" />
-			<java-attributes>
-				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v11.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v11.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v11.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v11.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v11.VirtualDataCenters" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="CloudRegions">
-			<xml-root-element name="cloud-regions" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v11.CloudRegion" />
-			</java-attributes>
+        <java-type name="CloudInfrastructure">
             <xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="CloudRegion">
-			<xml-root-element name="cloud-region" />
-			<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-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the cloud (e.g., openstack)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL of the keystone identity service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudEpaCaps" name="cloud-epa-caps" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." />
-					</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="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v11.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v11.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v11.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v11.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v11.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v11.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                <xml-property name="description" value="Namespace for cloud infrastructure."/>
+            </xml-properties>
+            <xml-root-element name="cloud-infrastructure"/>
+            <java-attributes>
+                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v11.Complexes"/>
+                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v11.CloudRegions"/>
+                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v11.NetworkProfiles"/>
+                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v11.Pservers"/>
+                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v11.VirtualDataCenters"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CloudRegions">
+            <xml-root-element name="cloud-regions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v11.CloudRegion"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CloudRegion">
+            <xml-root-element name="cloud-region"/>
+            <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-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the cloud (e.g., openstack)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudEpaCaps" name="cloud-epa-caps" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="MultiVIM will discover and expose EPA capabilities."/>
+                    </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="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v11.VolumeGroups"/>
+                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v11.Tenants"/>
+                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v11.Flavors"/>
+                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v11.GroupAssignments"/>
+                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v11.Snapshots"/>
+                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v11.Images"/>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches"/>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks"/>
+                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
 				<xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v11.VipIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v11.VipIpv6AddressList" />
-			</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="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="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-		<java-type name="VolumeGroups">
-			<xml-properties>
-				<xml-property name="description" value="Collection of persistent block-level storage." />
-			</xml-properties>
-			<xml-root-element name="volume-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v11.VolumeGroup" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VolumeGroup">
-			<xml-root-element name="volume-group" />
-			<java-attributes>
-				<xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of volume-group." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the volume group." />
-					</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 volume-group" />
-					</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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this volume-group" />
-					</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="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-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="Persistent block-level storage." />
-				<xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" />
-				<xml-property name="searchable" value="volume-group-id,volume-group-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="volume-groups" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="RelationshipList">
-			<xml-root-element name="relationship-list" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v11.Relationship" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Relationship">
-			<xml-root-element name="relationship" />
-			<java-attributes>
-				<xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to the object in A&amp;AI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v11.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v11.RelatedToProperty" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="RelatedToProperty">
-			<xml-root-element name="related-to-property" />
-			<java-attributes>
-				<xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Key part of a key/value pair" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Value part of a key/value pair" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
-
-		<java-type name="RelationshipData">
-			<xml-root-element name="relationship-data" />
-			<java-attributes>
-				<xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Value of the attribute." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Complexes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-			</xml-properties>
-			<xml-root-element name="complexes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v11.Complex" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Complex">
-			<xml-root-element name="complex" />
-			<java-attributes>
-				<xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Data center code which can be an alternate way to identify a complex" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Gamma complex name for LCP instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL of the keystone identity service" />
-					</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="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type, e.g., central office, data center." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" />
-				<xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-				<xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-				<xml-element java-attribute="state" name="state" type="java.lang.String" />
-				<xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-				<xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-				<xml-element java-attribute="region" name="region" required="true" type="java.lang.String" />
-				<xml-element java-attribute="latitude" name="latitude" type="java.lang.String" />
-				<xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
-				<xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
-				<xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-				<xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v11.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-				<xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id" />
-				<xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code" />
-				<xml-property name="uniqueProps" value="physical-location-id" />
-				<xml-property name="container" value="complexes" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="CtagPools">
-			<xml-root-element name="ctag-pools" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v11.CtagPool" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="CtagPool">
-			<xml-root-element name="ctag-pool" />
-			<java-attributes>
-				<xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="The Target provider edge router" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the availability zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Describes what the intended purpose of this pool is." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Comma separated list of ctags" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="A collection of C tags (vlan tags) grouped for a specific purpose." />
-				<xml-property name="indexedProps" value="availability-zone-name" />
-				<xml-property name="dependentOn" value="complex" />
-				<xml-property name="container" value="ctag-pools" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Tenants">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack tenants." />
-			</xml-properties>
-			<xml-root-element name="tenants" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v11.Tenant" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Tenant">
-			<xml-root-element name="tenant" />
-			<java-attributes>
-				<xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id relative to the cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Readable name of tenant" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the tenant context." />
-					</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="vservers" name="vservers" type="inventory.aai.onap.org.v11.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack tenant" />
-				<xml-property name="nameProps" value="tenant-name" />
-				<xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context" />
-				<xml-property name="searchable" value="tenant-id,tenant-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="tenants" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Vservers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." />
-			</xml-properties>
-			<xml-root-element name="vservers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v11.Vserver" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vserver">
-			<xml-root-element name="vserver" />
-			<java-attributes>
-				<xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier for this vserver relative to its tenant" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of vserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternative name of vserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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="volumes" name="volumes" type="inventory.aai.onap.org.v11.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
-				<xml-property name="nameProps" value="vserver-name" />
-				<xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" />
-				<xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2" />
-				<xml-property name="dependentOn" value="tenant" />
-				<xml-property name="container" value="vservers" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="LInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of logical interfaces." />
-			</xml-properties>
-			<xml-root-element name="l-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v11.LInterface" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="LInterface">
-			<xml-root-element name="l-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name given to the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="MAC address for the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<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 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 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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block." />
-					</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" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Logical interfaces, e.g., a vnic." />
-				<xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
-				<xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
-				<xml-property name="container" value="l-interfaces" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="SriovVfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of SR-IOV Virtual Functions." />
-			</xml-properties>
-			<xml-root-element name="sriov-vfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v11.SriovVf" />
-			</java-attributes>
-		</java-type>
-		<java-type name="SriovVf">
-			<xml-root-element name="sriov-vf" />
-			<java-attributes>
-				<xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="PCI ID used to identify the sriov-vf" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto." />
-					</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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
-				<xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" />
-				<xml-property name="dependentOn" value="l-interface" />
-				<xml-property name="container" value="sriov-vfs" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="L3InterfaceIpv4AddressList">
-			<xml-root-element name="l3-interface-ipv4-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 32 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv4 Address Range" />
-				<xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Vlans">
-			<xml-root-element name="vlans" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v11.Vlan" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vlan">
-			<xml-root-element name="vlan" />
-			<java-attributes>
-				<xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="String that identifies the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</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="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to describe (the service associated with) the vlan" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
-					<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 java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
-					</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" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key" />
-				<xml-property name="dependentOn" value="l-interface" />
-				<xml-property name="container" value="vlans" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="L3InterfaceIpv6AddressList">
-			<xml-root-element name="l3-interface-ipv6-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 128 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv6 Address Range" />
-				<xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Volumes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of ephemeral Block storage volumes." />
-			</xml-properties>
-			<xml-root-element name="volumes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v11.Volume" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Volume">
-			<xml-root-element name="volume" />
-			<java-attributes>
-				<xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of block storage volume relative to the vserver." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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="Ephemeral Block storage volume." />
-				<xml-property name="indexedProps" value="volume-id" />
-				<xml-property name="dependentOn" value="vserver" />
-				<xml-property name="container" value="volumes" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Flavors">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack flavors." />
-			</xml-properties>
-			<xml-root-element name="flavors" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v11.Flavor" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Flavor">
-			<xml-root-element name="flavor" />
-			<java-attributes>
-				<xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Flavor id, expected to be unique across cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Flavor name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Number of CPUs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Amount of memory" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Disk space" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Amount of ephemeral disk space" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="amount of swap space allocation" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="Openstack flavor." />
-				<xml-property name="nameProps" value="flavor-name" />
-				<xml-property name="indexedProps" value="flavor-name,flavor-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<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-properties>
-			<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-type>
-		
-		<java-type name="Snapshot">
-			<xml-root-element name="snapshot" />
-			<java-attributes>
-				<xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Snapshot name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operating system architecture" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The common name of the operating system distribution in lowercase" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The operating system version as specified by the distributor." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." />
-					</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="Openstack snapshot" />
-				<xml-property name="nameProps" value="snapshot-name" />
-				<xml-property name="uniqueProps" value="snapshot-id" />
-				<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>	
-		</java-type>
-		
-		<java-type name="GroupAssignments">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack group assignments" />
-			</xml-properties>
-			<xml-root-element name="group-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v11.GroupAssignment" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="GroupAssignment">
-			<xml-root-element name="group-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Group id, expected to be unique across cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group type - the type of group this instance refers to" />
-					</xml-properties>
-				</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-element>
-				<xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group description - description of the group" />
-					</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="Openstack group-assignment used to store exclusivity groups (EG)." />
-				<xml-property name="nameProps" value="group-name" />
-				<xml-property name="indexedProps" value="group-id,group-type,group-name" />
-				<xml-property name="searchable" value="group-id,group-name"/>
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="group-assignments" />
-			</xml-properties>
-		</java-type>			
-
-		<java-type name="Images">
-			<xml-properties>
-				<xml-property name="description" value="Collectio of Openstack images." />
-			</xml-properties>
-			<xml-root-element name="images" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v11.Image" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Image">
-			<xml-root-element name="image" />
-			<java-attributes>
-				<xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Image id, expected to be unique across cloud region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Image name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operating system architecture." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The common name of the operating system distribution in lowercase" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The operating system version as specified by the distributor." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack image." />
-				<xml-property name="nameProps" value="image-name" />
-				<xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="images" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Metadata">
-			<xml-properties>
-				<xml-property name="description" value="Collection of metadatum (key/value pairs)" />
-			</xml-properties>
-			<xml-root-element name="metadata" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v11.Metadatum" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Metadatum">
-			<xml-root-element name="metadatum" />
-			<java-attributes>
-				<xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="metaval" name="metaval" required="true" 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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Key/value pairs" />
-				<xml-property name="indexedProps" value="metaname" />
-				<xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" />
-				<xml-property name="container" value="metadata" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="DvsSwitches">
-			<xml-properties>
-				<xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." />
-			</xml-properties>
-			<xml-root-element name="dvs-switches" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v11.DvsSwitch" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="DvsSwitch">
-			<xml-root-element name="dvs-switch" />
-			<java-attributes>
-				<xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="DVS switch name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL used to reach the vcenter" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
-				<xml-property name="indexedProps" value="vcenter-url,switch-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="dvs-switches" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="NetworkProfiles">
-			<xml-properties>
-				<xml-property name="description" value="Collection of network profiles" />
-			</xml-properties>
-			<xml-root-element name="network-profiles" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v11.NetworkProfile" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="NetworkProfile">
-			<xml-root-element name="network-profile" />
-			<java-attributes>
-				<xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique name of network profile." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encrypted SNMP community string" />
-					</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="Network profile populated by SDN-GP for SNMP" />
-				<xml-property name="indexedProps" value="nm-profile-name" />
-				<xml-property name="container" value="network-profiles" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Pservers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of compute hosts." />
-			</xml-properties>
-			<xml-root-element name="pservers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v11.Pserver" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Pserver">
-			<xml-root-element name="pserver" />
-			<java-attributes>
-				<xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Value from executing hostname on the compute node." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="PTNII name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Number of cpus" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Disk size, in GBs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="RAM size, in MBs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Fully-qualified domain name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Serial number, may be queried" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 OAM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of Pserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="internet topology of Pserver" />
-					</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 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="pserverName2" name="pserver-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="alternative pserver name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="purpose of pserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates who owns and or manages the device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The host profile that defines the configuration of the pserver." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
-				<xml-property name="nameProps" value="pserver-name2" />
-				<xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status" />
-				<xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" />
-				<xml-property name="container" value="pservers" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="PInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical interfaces." />
-			</xml-properties>
-			<xml-root-element name="p-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v11.PInterface" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="PInterface">
-			<xml-root-element name="p-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name that identifies the physical interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Nature of the services and connectivity on this port." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CLEI or other specification for p-interface hardware." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role specification for p-interface hardware." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the physical properties of the interface." />
-					</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="macAddress" name="mac-addresss" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="MAC Address of the p-interface." />
-					</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="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="inventory status" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v11.SriovPfs" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Physical interface (e.g., nic)" />
-				<xml-property name="indexedProps" value="interface-name,prov-status" />
-				<xml-property name="nameProps" value="prov-status" />
-				<xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
-				<xml-property name="container" value="p-interfaces" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="LagInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of link aggregate interfaces." />
-			</xml-properties>
-			<xml-root-element name="lag-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v11.LagInterface" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="LagInterface">
-			<xml-root-element name="lag-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name that identifies the link aggregate interface" />
-					</xml-properties>
-				</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 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="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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 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,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>
-
-		<java-type name="OamNetworks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. " />
-			</xml-properties>
-			<xml-root-element name="oam-networks" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v11.OamNetwork" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="OamNetwork">
-			<xml-root-element name="oam-network" />
-			<java-attributes>
-				<xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of the network. Unique across a cloud-region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="cvlan-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
-				<xml-property name="nameProps" value="network-name" />
-				<xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="oam-networks" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="AvailabilityZones">
-			<xml-properties>
-				<xml-property name="description" value="Collection of availability zones" />
-			</xml-properties>
-			<xml-root-element name="availability-zones" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="AvailabilityZone">
-			<xml-root-element name="availability-zone" />
-			<java-attributes>
-				<xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the availability zone.  Unique across a cloud region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="Availability zone, a collection of compute hosts/pservers" />
-				<xml-property name="indexedProps" value="availability-zone-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="availability-zones" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VirtualDataCenters">
-			<xml-properties>
-				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-			</xml-properties>
-			<xml-root-element name="virtual-data-centers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v11.VirtualDataCenter" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VirtualDataCenter">
-			<xml-root-element name="virtual-data-center" />
-			<java-attributes>
-				<xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of the vdc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the virtual data center" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="Virtual organization of cloud infrastructure elements in a data center context" />
-				<xml-property name="nameProps" value="vdc-name" />
-				<xml-property name="indexedProps" value="vdc-name,vdc-id" />
-				<xml-property name="container" value="virtual-data-centers" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Business">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for business related constructs" />
-			</xml-properties>
-			<xml-root-element name="business" />
-			<java-attributes>
-				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v11.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v11.Customers" />
-				<xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v11.LinesOfBusiness" />
-				<xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v11.OwningEntities" />
-				<xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v11.Platforms" />
-				<xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v11.Projects" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Projects">
-			<xml-properties>
-				<xml-property name="description" value="Collection of projects" />
-			</xml-properties>
-			<xml-root-element name="projects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v11.Project" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Project">
-			<xml-root-element name="project" />
-			<java-attributes>
-				<xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the project deploying a service" />
-					</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="describes the project" />
-				<xml-property name="indexedProps" value="project-name" />
-				<xml-property name="uniqueProps" value="project-name" />
-				<xml-property name="container" value="projects" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Connectors">
-			<xml-properties>
-				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
-			</xml-properties>
-			<xml-root-element name="connectors" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v11.Connector" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Connector">
-			<xml-root-element name="connector" />
-			<java-attributes>
-				<xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of resource instance." />
-					</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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
-				<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>
-		</java-type>
-
-		<java-type name="Customers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." />
-			</xml-properties>
-			<xml-root-element name="customers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v11.Customer" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Customer">
-			<xml-root-element name="customer" />
-			<java-attributes>
-				<xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." />
-						<xml-property name="defaultValue" value="CUST" />
-					</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="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v11.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
-				<xml-property name="nameProps" value="subscriber-name" />
-				<xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
-				<xml-property name="searchable" value="global-customer-id,subscriber-name" />
-				<xml-property name="uniqueProps" value="global-customer-id" />
-				<xml-property name="container" value="customers" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="LinesOfBusiness">
-			<xml-properties>
-				<xml-property name="description" value="Collection of lines-of-business" />
-			</xml-properties>
-			<xml-root-element name="lines-of-business" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v11.LineOfBusiness" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="LineOfBusiness">
-			<xml-root-element name="line-of-business" />
-			<java-attributes>
-				<xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the line-of-business (product)" />
-					</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="describes a line-of-business" />
-				<xml-property name="indexedProps" value="line-of-business-name" />
-				<xml-property name="uniqueProps" value="line-of-business-name" />
-				<xml-property name="container" value="lines-of-business" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="OwningEntities">
-			<xml-properties>
-				<xml-property name="description" value="Collection of owning-entities" />
-			</xml-properties>
-			<xml-root-element name="owning-entities" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v11.OwningEntity" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="OwningEntity">
-			<xml-root-element name="owning-entity" />
-			<java-attributes>
-				<xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of an owning entity" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Owning entity name" />
-					</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="describes an owning-entity" />
-				<xml-property name="indexedProps" value="owning-entity-id, owning-entity-name" />
-				<xml-property name="searchable" value="owning-entity-id" />
-				<xml-property name="uniqueProps" value="owning-entity-id, owning-entity-name" />
-				<xml-property name="container" value="owning-entities" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Platforms">
-			<xml-properties>
-				<xml-property name="description" value="Collection of platforms" />
-			</xml-properties>
-			<xml-root-element name="platforms" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v11.Platform" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Platform">
-			<xml-root-element name="platform" />
-			<java-attributes>
-				<xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the platform" />
-					</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="describes a platform" />
-				<xml-property name="indexedProps" value="platform-name" />
-				<xml-property name="uniqueProps" value="platform-name" />
-				<xml-property name="container" value="platforms" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="ServiceSubscriptions">
-			<xml-properties>
-				<xml-property name="description" value="Collection of objects that group service instances." />
-			</xml-properties>
-			<xml-root-element name="service-subscriptions" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v11.ServiceSubscription" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ServiceSubscription">
-			<xml-root-element name="service-subscription" />
-			<java-attributes>
-				<xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v11.VipIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v11.VipIpv6AddressList"/>
+            </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="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="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="VolumeGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of persistent block-level storage."/>
+            </xml-properties>
+            <xml-root-element name="volume-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v11.VolumeGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VolumeGroup">
+            <xml-root-element name="volume-group"/>
+            <java-attributes>
+                <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution." />
+                        <xml-property name="description" value="Unique ID of volume-group."/>
                     </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="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v11.ServiceInstances">
-				</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="Object that group service instances." />
-				<xml-property name="indexedProps" value="service-type" />
-				<xml-property name="dependentOn" value="customer" />
-				<xml-property name="container" value="service-subscriptions" />
-				<xml-property name="crossEntityReference" value="service-instance,service-type" />
-			</xml-properties>
-		</java-type>
+                <xml-element java-attribute="volumeGroupName" name="volume-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the volume group."/>
+                    </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 volume-group"/>
+                    </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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this volume-group"/>
+                    </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="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-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="Persistent block-level storage."/>
+                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id"/>
+                <xml-property name="searchable" value="volume-group-id,volume-group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="volume-groups"/>
+                <xml-property name="uriTemplate" value="/volume-groups/volume-group/{volume-group-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="RelationshipList">
+            <xml-root-element name="relationship-list"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v11.Relationship"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Relationship">
+            <xml-root-element name="relationship"/>
+            <java-attributes>
+                <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to the object in A&amp;AI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v11.RelationshipData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v11.RelatedToProperty"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelatedToProperty">
+            <xml-root-element name="related-to-property"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Key part of a key/value pair"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Value part of a key/value pair"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ServiceInstances">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service instances" />
-			</xml-properties>
-			<xml-root-element name="service-instances" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v11.ServiceInstance" />
-			</java-attributes>
-		</java-type>
+        <java-type name="RelationshipData">
+            <xml-root-element name="relationship-data"/>
+            <java-attributes>
+                <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Value of the attribute."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ServiceInstance">
-			<xml-root-element name="service-instance" />
-			<java-attributes>
-				<xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this instance of a service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
-					<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="serviceType" name="service-type" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="String capturing type of service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="String capturing the service role." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the environment context assigned to the service-instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the workload context assigned to the service-instance." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="Complexes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+            </xml-properties>
+            <xml-root-element name="complexes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v11.Complex"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Complex">
+            <xml-root-element name="complex"/>
+            <java-attributes>
+                <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gamma complex name for LCP instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
+                    </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="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type, e.g., central office, data center."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="street2" name="street2" type="java.lang.String"/>
+                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="state" name="state" type="java.lang.String"/>
+                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"/>
+                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"/>
+                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"/>
+                <xml-element java-attribute="lata" name="lata" type="java.lang.String"/>
+                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v11.CtagPools"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id"/>
+                <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code"/>
+                <xml-property name="uniqueProps" value="physical-location-id"/>
+                <xml-property name="container" value="complexes"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/complexes/complex/{physical-location-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CtagPools">
+            <xml-root-element name="ctag-pools"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v11.CtagPool"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CtagPool">
+            <xml-root-element name="ctag-pool"/>
+            <java-attributes>
+                <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="The Target provider edge router"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the availability zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes what the intended purpose of this pool is."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Comma separated list of ctags"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="A collection of C tags (vlan tags) grouped for a specific purpose."/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="ctag-pools"/>
+                <xml-property name="uriTemplate" value="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Tenants">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack tenants."/>
+            </xml-properties>
+            <xml-root-element name="tenants"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v11.Tenant"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Tenant">
+            <xml-root-element name="tenant"/>
+            <java-attributes>
+                <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id relative to the cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Readable name of tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the tenant context."/>
+                    </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="vservers" name="vservers" type="inventory.aai.onap.org.v11.Vservers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack tenant"/>
+                <xml-property name="nameProps" value="tenant-name"/>
+                <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context"/>
+                <xml-property name="searchable" value="tenant-id,tenant-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="tenants"/>
+                <xml-property name="uriTemplate" value="/tenants/tenant/{tenant-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs."/>
+            </xml-properties>
+            <xml-root-element name="vservers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v11.Vserver"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vserver">
+            <xml-root-element name="vserver"/>
+            <java-attributes>
+                <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternative name of vserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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). 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" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="volumes" name="volumes" type="inventory.aai.onap.org.v11.Volumes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
+                <xml-property name="nameProps" value="vserver-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2"/>
+                <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="container" value="vservers"/>
+                <xml-property name="uriTemplate" value="/vservers/vserver/{vserver-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="LInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="l-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v11.LInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LInterface">
+            <xml-root-element name="l-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name given to the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="MAC address for the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <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 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 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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block."/>
+                    </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"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
+                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name"/>
+                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface"/>
+                <xml-property name="container" value="l-interfaces"/>
+                <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SriovVfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Virtual Functions."/>
+            </xml-properties>
+            <xml-root-element name="sriov-vfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v11.SriovVf"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovVf">
+            <xml-root-element name="sriov-vf"/>
+            <java-attributes>
+                <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="PCI ID used to identify the sriov-vf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
+                    </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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
+                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="sriov-vfs"/>
+                <xml-property name="uriTemplate" value="/sriov-vfs/sriov-vf/{pci-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="L3InterfaceIpv4AddressList">
+            <xml-root-element name="l3-interface-ipv4-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc"/>
+            <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vlans">
+            <xml-root-element name="vlans"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v11.Vlan"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vlan">
+            <xml-root-element name="vlan"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="String that identifies the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </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="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to describe (the service associated with) the vlan"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
+                    <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 java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                    </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"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of vlan"/>
+                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="vlans"/>
+                <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="L3InterfaceIpv6AddressList">
+            <xml-root-element name="l3-interface-ipv6-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc"/>
+            <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Volumes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of ephemeral Block storage volumes."/>
+            </xml-properties>
+            <xml-root-element name="volumes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v11.Volume"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Volume">
+            <xml-root-element name="volume"/>
+            <java-attributes>
+                <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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="Ephemeral Block storage volume."/>
+                <xml-property name="indexedProps" value="volume-id"/>
+                <xml-property name="dependentOn" value="vserver"/>
+                <xml-property name="container" value="volumes"/>
+                <xml-property name="uriTemplate" value="/volumes/volume/{volume-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Flavors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack flavors."/>
+            </xml-properties>
+            <xml-root-element name="flavors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v11.Flavor"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Flavor">
+            <xml-root-element name="flavor"/>
+            <java-attributes>
+                <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Flavor name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of CPUs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Amount of memory"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Disk space"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Amount of ephemeral disk space"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="amount of swap space allocation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="Openstack flavor."/>
+                <xml-property name="nameProps" value="flavor-name"/>
+                <xml-property name="indexedProps" value="flavor-name,flavor-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="flavors"/>
+                <xml-property name="uriTemplate" value="/flavors/flavor/{flavor-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Snapshots">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack snapshots"/>
+            </xml-properties>
+            <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-type>
+
+        <java-type name="Snapshot">
+            <xml-root-element name="snapshot"/>
+            <java-attributes>
+                <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Snapshot name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system architecture"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
+                    </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="Openstack snapshot"/>
+                <xml-property name="nameProps" value="snapshot-name"/>
+                <xml-property name="uniqueProps" value="snapshot-id"/>
+                <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-property name="uriTemplate" value="/snapshots/snapshot/{snapshot-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="GroupAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack group assignments"/>
+            </xml-properties>
+            <xml-root-element name="group-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v11.GroupAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="GroupAssignment">
+            <xml-root-element name="group-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Group id, expected to be unique across cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group type - the type of group this instance refers to"/>
+                    </xml-properties>
+                </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-element>
+                <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group description - description of the group"/>
+                    </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="Openstack group-assignment used to store exclusivity groups (EG)."/>
+                <xml-property name="nameProps" value="group-name"/>
+                <xml-property name="indexedProps" value="group-id,group-type,group-name"/>
+                <xml-property name="searchable" value="group-id,group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="group-assignments"/>
+                <xml-property name="uriTemplate" value="/group-assignments/group-assignment/{group-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Images">
+            <xml-properties>
+                <xml-property name="description" value="Collectio of Openstack images."/>
+            </xml-properties>
+            <xml-root-element name="images"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v11.Image"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Image">
+            <xml-root-element name="image"/>
+            <java-attributes>
+                <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Image id, expected to be unique across cloud region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Image name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system architecture."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack image."/>
+                <xml-property name="nameProps" value="image-name"/>
+                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="images"/>
+                <xml-property name="uriTemplate" value="/images/image/{image-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Metadata">
+            <xml-properties>
+                <xml-property name="description" value="Collection of metadatum (key/value pairs)"/>
+            </xml-properties>
+            <xml-root-element name="metadata"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v11.Metadatum"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Metadatum">
+            <xml-root-element name="metadatum"/>
+            <java-attributes>
+                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="metaval" name="metaval" required="true" 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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Key/value pairs"/>
+                <xml-property name="indexedProps" value="metaname"/>
+                <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model"/>
+                <xml-property name="container" value="metadata"/>
+                <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="DvsSwitches">
+            <xml-properties>
+                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs."/>
+            </xml-properties>
+            <xml-root-element name="dvs-switches"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v11.DvsSwitch"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="DvsSwitch">
+            <xml-root-element name="dvs-switch"/>
+            <java-attributes>
+                <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS switch name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL used to reach the vcenter"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
+                <xml-property name="indexedProps" value="vcenter-url,switch-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="dvs-switches"/>
+                <xml-property name="uriTemplate" value="/dvs-switches/dvs-switch/{switch-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkProfiles">
+            <xml-properties>
+                <xml-property name="description" value="Collection of network profiles"/>
+            </xml-properties>
+            <xml-root-element name="network-profiles"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v11.NetworkProfile"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NetworkProfile">
+            <xml-root-element name="network-profile"/>
+            <java-attributes>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique name of network profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted SNMP community string"/>
+                    </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="Network profile populated by SDN-GP for SNMP"/>
+                <xml-property name="indexedProps" value="nm-profile-name"/>
+                <xml-property name="container" value="network-profiles"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of compute hosts."/>
+            </xml-properties>
+            <xml-root-element name="pservers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v11.Pserver"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pserver">
+            <xml-root-element name="pserver"/>
+            <java-attributes>
+                <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value from executing hostname on the compute node."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="PTNII name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of cpus"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Disk size, in GBs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="RAM size, in MBs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Fully-qualified domain name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number, may be queried"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of Pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="internet topology of Pserver"/>
+                    </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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </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="pserverName2" name="pserver-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="alternative pserver name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="purpose of pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates who owns and or manages the device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The host profile that defines the configuration of the pserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
+                <xml-property name="nameProps" value="pserver-name2"/>
+                <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status"/>
+                <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address"/>
+                <xml-property name="uniqueProps" value="hostname"/>
+                <xml-property name="container" value="pservers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/pservers/pserver/{hostname}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="p-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v11.PInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PInterface">
+            <xml-root-element name="p-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the physical interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nature of the services and connectivity on this port."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role specification for p-interface hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
+                    </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="macAddress" name="mac-addresss" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="MAC Address of the p-interface."/>
+                    </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="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="inventory status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+                <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v11.SriovPfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Physical interface (e.g., nic)"/>
+                <xml-property name="indexedProps" value="interface-name,prov-status"/>
+                <xml-property name="nameProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
+                <xml-property name="container" value="p-interfaces"/>
+                <xml-property name="uriTemplate" value="/p-interfaces/p-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="LagInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregate interfaces."/>
+            </xml-properties>
+            <xml-root-element name="lag-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v11.LagInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LagInterface">
+            <xml-root-element name="lag-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the link aggregate interface"/>
+                    </xml-properties>
+                </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 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="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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 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,interface-id,interface-role"/>
+                <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/>
+                <xml-property name="container" value="lag-interfaces"/>
+                <xml-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OamNetworks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. "/>
+            </xml-properties>
+            <xml-root-element name="oam-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v11.OamNetwork"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OamNetwork">
+            <xml-root-element name="oam-network"/>
+            <java-attributes>
+                <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="cvlan-id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="oam-networks"/>
+                <xml-property name="uriTemplate" value="/oam-networks/oam-network/{network-uuid}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="AvailabilityZones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of availability zones"/>
+            </xml-properties>
+            <xml-root-element name="availability-zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AvailabilityZone">
+            <xml-root-element name="availability-zone"/>
+            <java-attributes>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="Availability zone, a collection of compute hosts/pservers"/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="availability-zones"/>
+                <xml-property name="uriTemplate" value="/availability-zones/availability-zone/{availability-zone-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VirtualDataCenters">
+            <xml-properties>
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+            </xml-properties>
+            <xml-root-element name="virtual-data-centers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v11.VirtualDataCenter"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VirtualDataCenter">
+            <xml-root-element name="virtual-data-center"/>
+            <java-attributes>
+                <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the vdc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the virtual data center"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="Virtual organization of cloud infrastructure elements in a data center context"/>
+                <xml-property name="nameProps" value="vdc-name"/>
+                <xml-property name="indexedProps" value="vdc-name,vdc-id"/>
+                <xml-property name="container" value="virtual-data-centers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Business">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for business related constructs"/>
+            </xml-properties>
+            <xml-root-element name="business"/>
+            <java-attributes>
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v11.Connectors"/>
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v11.Customers"/>
+                <xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v11.LinesOfBusiness"/>
+                <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v11.OwningEntities"/>
+                <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v11.Platforms"/>
+                <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v11.Projects"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Projects">
+            <xml-properties>
+                <xml-property name="description" value="Collection of projects"/>
+            </xml-properties>
+            <xml-root-element name="projects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v11.Project"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Project">
+            <xml-root-element name="project"/>
+            <java-attributes>
+                <xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the project deploying a service"/>
+                    </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="describes the project"/>
+                <xml-property name="indexedProps" value="project-name"/>
+                <xml-property name="uniqueProps" value="project-name"/>
+                <xml-property name="container" value="projects"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/projects/project/{project-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Connectors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
+            </xml-properties>
+            <xml-root-element name="connectors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v11.Connector"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Connector">
+            <xml-root-element name="connector"/>
+            <java-attributes>
+                <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of resource instance."/>
+                    </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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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">
+                    <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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
+                <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-property name="uriTemplate" value="/business/connectors/connector/{resource-instance-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Customers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
+            </xml-properties>
+            <xml-root-element name="customers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v11.Customer"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Customer">
+            <xml-root-element name="customer"/>
+            <java-attributes>
+                <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers."/>
+                        <xml-property name="defaultValue" value="CUST"/>
+                    </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="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v11.ServiceSubscriptions"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
+                <xml-property name="nameProps" value="subscriber-name"/>
+                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type"/>
+                <xml-property name="searchable" value="global-customer-id,subscriber-name"/>
+                <xml-property name="uniqueProps" value="global-customer-id"/>
+                <xml-property name="container" value="customers"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/customers/customer/{global-customer-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="LinesOfBusiness">
+            <xml-properties>
+                <xml-property name="description" value="Collection of lines-of-business"/>
+            </xml-properties>
+            <xml-root-element name="lines-of-business"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v11.LineOfBusiness"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LineOfBusiness">
+            <xml-root-element name="line-of-business"/>
+            <java-attributes>
+                <xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the line-of-business (product)"/>
+                    </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="describes a line-of-business"/>
+                <xml-property name="indexedProps" value="line-of-business-name"/>
+                <xml-property name="uniqueProps" value="line-of-business-name"/>
+                <xml-property name="container" value="lines-of-business"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/lines-of-business/line-of-business/{line-of-business-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OwningEntities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of owning-entities"/>
+            </xml-properties>
+            <xml-root-element name="owning-entities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v11.OwningEntity"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OwningEntity">
+            <xml-root-element name="owning-entity"/>
+            <java-attributes>
+                <xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an owning entity"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Owning entity name"/>
+                    </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="describes an owning-entity"/>
+                <xml-property name="indexedProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="searchable" value="owning-entity-id"/>
+                <xml-property name="uniqueProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="container" value="owning-entities"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/owning-entities/owning-entity/{owning-entity-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Platforms">
+            <xml-properties>
+                <xml-property name="description" value="Collection of platforms"/>
+            </xml-properties>
+            <xml-root-element name="platforms"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v11.Platform"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Platform">
+            <xml-root-element name="platform"/>
+            <java-attributes>
+                <xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the platform"/>
+                    </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="describes a platform"/>
+                <xml-property name="indexedProps" value="platform-name"/>
+                <xml-property name="uniqueProps" value="platform-name"/>
+                <xml-property name="container" value="platforms"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/platforms/platform/{platform-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceSubscriptions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of objects that group service instances."/>
+            </xml-properties>
+            <xml-root-element name="service-subscriptions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v11.ServiceSubscription"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceSubscription">
+            <xml-root-element name="service-subscription"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
+                    </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="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v11.ServiceInstances">
+                </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="Object that group service instances."/>
+                <xml-property name="indexedProps" value="service-type"/>
+                <xml-property name="dependentOn" value="customer"/>
+                <xml-property name="container" value="service-subscriptions"/>
+                <xml-property name="crossEntityReference" value="service-instance,service-type"/>
+                <xml-property name="uriTemplate" value="/service-subscriptions/service-subscription/{service-type}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceInstances">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service instances"/>
+            </xml-properties>
+            <xml-root-element name="service-instances"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v11.ServiceInstance"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceInstance">
+            <xml-root-element name="service-instance"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this instance of a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
+                    <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="serviceType" name="service-type" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing the service role."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the environment context assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the workload context assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="createdAt" name="created-at" required="false" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="create time of Network Service." />
@@ -2610,1589 +2642,1623 @@
 					</xml-properties>
 				</xml-element>
 				<!-- for storing the nsd_id create edge between services -->
-				<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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL customers will use to access the vHN Portal." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
-					</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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
-				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v11.AllottedResources" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Instance of a service" />
-				<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,environment-context,workload-context" />
-				<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" />
-				<xml-property name="dependentOn" value="service-subscription" />
-				<xml-property name="container" value="service-instances" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="ServiceDesignAndCreation">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for objects managed by ASDC" />
-			</xml-properties>
-			<xml-root-element name="service-design-and-creation" />
-			<java-attributes>
-				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v11.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v11.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v11.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v11.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v11.NamedQueries" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VnfImages">
-			<xml-properties>
-				<xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
-			</xml-properties>
-			<xml-root-element name="vnf-images" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v11.VnfImage" />
-			</java-attributes>
-		</java-type>
-
-		<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-properties>
-						<xml-property name="description" value="Unique ID of this asset" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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="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="container" value="vnf-images" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Services">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC." />
-			</xml-properties>
-			<xml-root-element name="services" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v11.Service" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Service">
-			<xml-root-element name="service" />
-			<java-attributes>
-				<xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description of the service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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="serviceVersion" name="service-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="service version" />
-					</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="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
-				<xml-property name="indexedProps" value="service-description,service-id" />
-				<xml-property name="container" value="services" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="ServiceCapabilities">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service capabilities." />
-			</xml-properties>
-			<xml-root-element name="service-capabilities" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v11.ServiceCapability" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ServiceCapability">
-			<xml-root-element name="service-capability" />
-			<java-attributes>
-				<xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="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="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="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
-				<xml-property name="indexedProps" value="service-type,vnf-type" />
-				<xml-property name="container" value="service-capabilities" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Network">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for network inventory resources." />
-			</xml-properties>
-			<xml-root-element name="network" />
-			<java-attributes>
-				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v11.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v11.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v11.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v11.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v11.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v11.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v11.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v11.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v11.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v11.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v11.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v11.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v11.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v11.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v11.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" />
-				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" />
-				<xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" />
-				<xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v11.Configurations" />
-			</java-attributes>
-		</java-type>
+                <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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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">
+                    <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="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL customers will use to access the vHN Portal."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used."/>
+                    </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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata"/>
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v11.AllottedResources"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a service"/>
+                <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,environment-context,workload-context"/>
+                <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"/>
+                <xml-property name="dependentOn" value="service-subscription"/>
+                <xml-property name="container" value="service-instances"/>
+                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceDesignAndCreation">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for objects managed by ASDC"/>
+            </xml-properties>
+            <xml-root-element name="service-design-and-creation"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v11.VnfImages"/>
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v11.Services"/>
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v11.ServiceCapabilities"/>
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v11.Models"/>
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v11.NamedQueries"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VnfImages">
+            <xml-properties>
+                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+            </xml-properties>
+            <xml-root-element name="vnf-images"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v11.VnfImage"/>
+            </java-attributes>
+        </java-type>
+
+        <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-properties>
+                        <xml-property name="description" value="Unique ID of this asset"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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="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="container" value="vnf-images"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Services">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
+            </xml-properties>
+            <xml-root-element name="services"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v11.Service"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Service">
+            <xml-root-element name="service"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of the service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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="serviceVersion" name="service-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="service version"/>
+                    </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="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services."/>
+                <xml-property name="indexedProps" value="service-description,service-id"/>
+                <xml-property name="container" value="services"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/services/service/{service-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceCapabilities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service capabilities."/>
+            </xml-properties>
+            <xml-root-element name="service-capabilities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v11.ServiceCapability"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceCapability">
+            <xml-root-element name="service-capability"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="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="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="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
+                <xml-property name="indexedProps" value="service-type,vnf-type"/>
+                <xml-property name="container" value="service-capabilities"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Network">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for network inventory resources."/>
+            </xml-properties>
+            <xml-root-element name="network"/>
+            <java-attributes>
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v11.LogicalLinks"/>
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v11.SitePairSets"/>
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v11.VpnBindings"/>
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v11.VplsPes"/>
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v11.MulticastConfigurations"/>
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v11.Vces"/>
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v11.Vnfcs"/>
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v11.L3Networks"/>
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v11.NetworkPolicies"/>
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v11.GenericVnfs"/>
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v11.LagLinks"/>
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v11.Newvces"/>
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v11.Pnfs"/>
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v11.PhysicalLinks"/>
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v11.IpsecConfigurations"/>
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences"/>
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups"/>
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones"/>
+                <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v11.Configurations"/>
+            </java-attributes>
+        </java-type>
         <java-type name="Configurations">
-			<xml-properties>
-				<xml-property name="description" value="Collection of configurations" />
-			</xml-properties>
-			<xml-root-element name="configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configurations" type="inventory.aai.onap.org.v11.Configuration" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Configuration">
-			<xml-root-element name="configuration" />
-			<java-attributes>
-				<xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID assigned to configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
-					</xml-properties>
-				</xml-element>				
-				<xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="port-mirroring-configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationSubType" name="configuration-sub-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="vprobe, pprobe." />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of the configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id of  the configuration used to customize the resource" />
-					</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" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Port Mirror Configuration." />
-				<xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" />
-				<xml-property name="uniqueProps" value="configuration-id" />
-				<xml-property name="container" value="configurations" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="nameProps" value="configuration-type" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="LogicalLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of logical connections" />
-			</xml-properties>
-			<xml-root-element name="logical-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v11.LogicalLink" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="LogicalLink">
-			<xml-root-element name="logical-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element 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 java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of logical link, e.g., evc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="v4, v6, or ds for dual stack" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="For example, static or BGP" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indication of operational status of the logical link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indication of the network use of the logical link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
-					</xml-properties>
-				</xml-element>
-					<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Reason for this entity, role it is playing" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
-				<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-property name="searchable" value="link-name" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="SitePairSets">
-			<xml-properties>
-				<xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" />
-			</xml-properties>
-			<xml-root-element name="site-pair-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v11.SitePairSet" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SitePairSet">
-			<xml-root-element name="site-pair-set" />
-			<java-attributes>
-				<xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of site pair set." />
-					</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="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v11.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
-				<xml-property name="indexedProps" value="site-pair-set-id" />
-				<xml-property name="uniqueProps" value="site-pair-set-id" />
-				<xml-property name="container" value="site-pair-sets" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="RoutingInstances">
-			<xml-properties>
-				<xml-property name="description" value="set of probes related to generic-vnf routing instance" />
-			</xml-properties>
-			<xml-root-element name="routing-instances" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v11.RoutingInstance" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="RoutingInstance">
-			<xml-root-element name="routing-instance" />
-			<java-attributes>
-				<xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of routing instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="rpm owner" />
-					</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="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v11.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="routing-instance-id" />
-				<xml-property name="dependentOn" value="site-pair-set" />
-				<xml-property name="container" value="routing-instances" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="SitePairs">
-			<xml-properties>
-				<xml-property name="description" value="probe within a set" />
-			</xml-properties>
-			<xml-root-element name="site-pairs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v11.SitePair" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SitePair">
-			<xml-root-element name="site-pair" />
-			<java-attributes>
-				<xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prefix address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prefix address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip version, v4, v6" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." />
-					</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="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v11.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="site-pair-id" />
-				<xml-property name="uniqueProps" value="site-pair-id" />
-				<xml-property name="dependentOn" value="routing-instance" />
-				<xml-property name="container" value="site-pairs" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="ClassesOfService">
-			<xml-properties>
-				<xml-property name="description" value="class-of-service of probe" />
-			</xml-properties>
-			<xml-root-element name="classes-of-service" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v11.ClassOfService" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ClassOfService">
-			<xml-root-element name="class-of-service" />
-			<java-attributes>
-				<xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="type of probe" />
-					</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="indexedProps" value="cos" />
-				<xml-property name="dependentOn" value="site-pair" />
-				<xml-property name="container" value="classes-of-service" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VpnBindings">
-			<xml-root-element name="vpn-bindings" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v11.VpnBinding" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VpnBinding">
-			<xml-root-element name="vpn-binding" />
-			<java-attributes>
-				<xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="VPN ID, globally unique within A&amp;AI" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="VPN Name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="region of customer vpn" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id for this customer vpn" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
-					</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="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-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="VPN binding" />
-				<xml-property name="nameProps" value="vpn-name,vpn-type" />
-				<xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type" />
-				<xml-property name="searchable" value="vpn-id,vpn-name" />
-				<xml-property name="uniqueProps" value="vpn-id" />
-				<xml-property name="container" value="vpn-bindings" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VplsPes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of VPLS Provider Edge routers" />
-			</xml-properties>
-			<xml-root-element name="vpls-pes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v11.VplsPe" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VplsPe">
-			<xml-root-element name="vpls-pe" />
-			<java-attributes>
-				<xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Temporary location for stag to get to VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="VPLS Provider Edge routers." />
-				<xml-property name="indexedProps" value="prov-status,equipment-name" />
-				<xml-property name="container" value="vpls-pes" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="MulticastConfigurations">
-			<xml-properties>
-				<xml-property name="description" value="multicast configuration of generic-vnf ip-address" />
-			</xml-properties>
-			<xml-root-element name="multicast-configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v11.MulticastConfiguration" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="MulticastConfiguration">
-			<xml-root-element name="multicast-configuration" />
-			<java-attributes>
-				<xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of multicast configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="protocol of multicast configuration" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="rp type of multicast configuration" />
-					</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="indexedProps" value="multicast-configuration-id" />
-				<xml-property name="uniqueProps" value="multicast-configuration-id" />
-				<xml-property name="container" value="multicast-configurations" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Vces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated." />
-			</xml-properties>
-			<xml-root-element name="vces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v11.Vce" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vce">
-			<xml-root-element name="vce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternate name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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 strictly map to ASDC services, 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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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="Network role being played by this VNF" />
-					</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, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of VPE connected to this VCE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Loopback0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  see child relationships" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v11.PortGroups" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
-				<xml-property name="nameProps" value="vnf-name" />
-				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" />
-				<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-				<xml-property name="uniqueProps" value="vnf-id" />
-				<xml-property name="container" value="vces" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="PortGroups">
-			<xml-root-element name="port-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v11.PortGroup" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="PortGroup">
-			<xml-root-element name="port-group" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network name of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="portGroupId" name="port-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for port group in vmware" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Likely to duplicate value of neutron network name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v11.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Used to capture the network interfaces of this VCE" />
-				<xml-property name="nameProps" value="port-group-name" />
-				<xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" />
-				<xml-property name="dependentOn" value="vce" />
-				<xml-property name="container" value="port-groups" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="CvlanTags">
-			<xml-root-element name="cvlan-tags" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v11.CvlanTagEntry" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="CvlanTagEntry">
-			<xml-root-element name="cvlan-tag-entry" />
-			<java-attributes>
-				<xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="See mis-na-virtualization-platform.yang" />
-					</xml-properties>
-				</xml-element>
-				<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="dependentOn" value="port-group" />
-				<xml-property name="indexedProps" value="cvlan-tag" />
-				<xml-property name="container" value="cvlan-tags" />
-			</xml-properties>
-		</java-type>
-
-
-
-		<java-type name="Vnfcs">
-			<xml-properties>
-				<xml-property name="description" value="virtual network components associated with a vserver from application controller." />
-			</xml-properties>
-			<xml-root-element name="vnfcs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v11.Vnfc" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vnfc">
-			<xml-root-element name="vnfc" />
-			<java-attributes>
-				<xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of vnfc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Short code that is used in naming instances of the item being modeled" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="prov status of this vnfc" />
-					</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, mastered by APP-C" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Oam V4 vip address of this vnfc" />
-					</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)" />
-					</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="groupNotation" name="group-notation" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group notation of VNFC" />
-					</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="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="requires" value="model-invariant-id" />
-					</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" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id" />
-				<xml-property name="searchable" value="vnfc-name" />
-				<xml-property name="container" value="vnfcs" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="L3Networks">
-			<xml-root-element name="l3-networks" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v11.L3Network" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="L3Network">
-			<xml-root-element name="l3-network" />
-			<java-attributes>
-				<xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network, governed by some naming convention.." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the network - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role the network plans - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network technology - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Set to true if bound to VPN" />
-					</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 from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="network role instance" />
-					</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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered 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="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contrail FQDN for the network" />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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="physicalNetworkName" name="physical-network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name associated with the physical network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is a provider network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is a shared network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is an external network." />
-					</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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v11.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v11.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v11.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" >
-					<xml-properties>
-						<xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Generic network definition" />
-				<xml-property name="nameProps" value="network-name" />
-				<xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
-				<xml-property name="searchable" value="network-id,network-name" />
-				<xml-property name="uniqueProps" value="network-id" />
-				<xml-property name="container" value="l3-networks" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		<java-type name="NetworkPolicies">
-			<xml-root-element name="network-policies" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v11.NetworkPolicy" />
-			</java-attributes>
-		</java-type>
-		<java-type name="NetworkPolicy">
-			<xml-root-element name="network-policy" />
-			<java-attributes>
-				<xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID representing unique key to this instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contrail FQDN for the policy" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID for the openStack Heat instance" />
-					</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="nameProps" value="network-policy-fqdn" />
-				<xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" />
-				<xml-property name="searchable" value="network-policy-id,network-policy-fqdn" />
-				<xml-property name="uniqueProps" value="network-policy-id" />
-				<xml-property name="container" value="network-policies" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		<java-type name="CtagAssignments">
-			<xml-root-element name="ctag-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v11.CtagAssignment" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="CtagAssignment">
-			<xml-root-element name="ctag-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="id." />
-					</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="indexedProps" value="vlan-id-inner" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<xml-property name="container" value="ctag-assignments" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Subnets">
-			<xml-root-element name="subnets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v11.Subnet" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Subnet">
-			<xml-root-element name="subnet" />
-			<java-attributes>
-				<xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Subnet ID, should be UUID." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name associated with the subnet." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of this subnet" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="gateway ip address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="network start address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="cidr mask" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip version" />
-					</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, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="dhcp enabled" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the start address reserved for use by dhcp" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the last address reserved for use by dhcp" />
-					</xml-properties>
-				</xml-element>
-					<xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role of the subnet, referenced when assigning IPs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip address assignment direction of the subnet" />
-					</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="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="sequence of the subnet" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v11.HostRoutes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="subnet-id,subnet-name" />
-				<xml-property name="nameProps" value="subnet-name" />
-				<xml-property name="uniqueProps" value="subnet-id" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<xml-property name="container" value="subnets" />
-			</xml-properties>
-		</java-type>
+            <xml-properties>
+                <xml-property name="description" value="Collection of configurations"/>
+            </xml-properties>
+            <xml-root-element name="configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v11.Configuration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Configuration">
+            <xml-root-element name="configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID assigned to configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="port-mirroring-configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSubType" name="configuration-sub-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vprobe, pprobe."/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of  the configuration used to customize the resource"/>
+                    </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"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Port Mirror Configuration."/>
+                <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id"/>
+                <xml-property name="uniqueProps" value="configuration-id"/>
+                <xml-property name="container" value="configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/configurations/configuration/{configuration-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="LogicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical connections"/>
+            </xml-properties>
+            <xml-root-element name="logical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v11.LogicalLink"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LogicalLink">
+            <xml-root-element name="logical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element 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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of logical link, e.g., evc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4, v6, or ds for dual stack"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="For example, static or BGP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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">
+                    <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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of operational status of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of the network use of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Reason for this entity, role it is playing"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/>
+                <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-property name="searchable" value="link-name"/>
+                <xml-property name="uriTemplate" value="/network/logical-links/logical-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SitePairSets">
+            <xml-properties>
+                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf"/>
+            </xml-properties>
+            <xml-root-element name="site-pair-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v11.SitePairSet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SitePairSet">
+            <xml-root-element name="site-pair-set"/>
+            <java-attributes>
+                <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of site pair set."/>
+                    </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="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v11.RoutingInstances"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
+                <xml-property name="indexedProps" value="site-pair-set-id"/>
+                <xml-property name="uniqueProps" value="site-pair-set-id"/>
+                <xml-property name="container" value="site-pair-sets"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/site-pair-sets/site-pair-set/{site-pair-set-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="RoutingInstances">
+            <xml-properties>
+                <xml-property name="description" value="set of probes related to generic-vnf routing instance"/>
+            </xml-properties>
+            <xml-root-element name="routing-instances"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v11.RoutingInstance"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RoutingInstance">
+            <xml-root-element name="routing-instance"/>
+            <java-attributes>
+                <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of routing instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rpm owner"/>
+                    </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="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v11.SitePairs"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="routing-instance-id"/>
+                <xml-property name="dependentOn" value="site-pair-set"/>
+                <xml-property name="container" value="routing-instances"/>
+                <xml-property name="uriTemplate" value="/routing-instances/routing-instance/{routing-instance-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SitePairs">
+            <xml-properties>
+                <xml-property name="description" value="probe within a set"/>
+            </xml-properties>
+            <xml-root-element name="site-pairs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v11.SitePair"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SitePair">
+            <xml-root-element name="site-pair"/>
+            <java-attributes>
+                <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version, v4, v6"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc."/>
+                    </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="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v11.ClassesOfService"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="site-pair-id"/>
+                <xml-property name="uniqueProps" value="site-pair-id"/>
+                <xml-property name="dependentOn" value="routing-instance"/>
+                <xml-property name="container" value="site-pairs"/>
+                <xml-property name="uriTemplate" value="/site-pairs/site-pair/{site-pair-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ClassesOfService">
+            <xml-properties>
+                <xml-property name="description" value="class-of-service of probe"/>
+            </xml-properties>
+            <xml-root-element name="classes-of-service"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v11.ClassOfService"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ClassOfService">
+            <xml-root-element name="class-of-service"/>
+            <java-attributes>
+                <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type of probe"/>
+                    </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="indexedProps" value="cos"/>
+                <xml-property name="dependentOn" value="site-pair"/>
+                <xml-property name="container" value="classes-of-service"/>
+                <xml-property name="uriTemplate" value="/classes-of-service/class-of-service/{cos}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VpnBindings">
+            <xml-root-element name="vpn-bindings"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v11.VpnBinding"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VpnBinding">
+            <xml-root-element name="vpn-binding"/>
+            <java-attributes>
+                <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN Name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="region of customer vpn"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id for this customer vpn"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network."/>
+                    </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="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-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPN binding"/>
+                <xml-property name="nameProps" value="vpn-name,vpn-type"/>
+                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type"/>
+                <xml-property name="searchable" value="vpn-id,vpn-name"/>
+                <xml-property name="uniqueProps" value="vpn-id"/>
+                <xml-property name="container" value="vpn-bindings"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpn-bindings/vpn-binding/{vpn-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VplsPes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VPLS Provider Edge routers"/>
+            </xml-properties>
+            <xml-root-element name="vpls-pes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v11.VplsPe"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VplsPe">
+            <xml-root-element name="vpls-pe"/>
+            <java-attributes>
+                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for stag to get to VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPLS Provider Edge routers."/>
+                <xml-property name="indexedProps" value="prov-status,equipment-name"/>
+                <xml-property name="container" value="vpls-pes"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpls-pes/vpls-pe/{equipment-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="MulticastConfigurations">
+            <xml-properties>
+                <xml-property name="description" value="multicast configuration of generic-vnf ip-address"/>
+            </xml-properties>
+            <xml-root-element name="multicast-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v11.MulticastConfiguration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="MulticastConfiguration">
+            <xml-root-element name="multicast-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of multicast configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="protocol of multicast configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rp type of multicast configuration"/>
+                    </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="indexedProps" value="multicast-configuration-id"/>
+                <xml-property name="uniqueProps" value="multicast-configuration-id"/>
+                <xml-property name="container" value="multicast-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated."/>
+            </xml-properties>
+            <xml-root-element name="vces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v11.Vce"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vce">
+            <xml-root-element name="vce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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 strictly map to ASDC services, 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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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="Network role being played by this VNF"/>
+                    </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, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of VPE connected to this VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Loopback0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  see child relationships"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v11.PortGroups"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="vces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="uriTemplate" value="/network/vces/vce/{vnf-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PortGroups">
+            <xml-root-element name="port-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v11.PortGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PortGroup">
+            <xml-root-element name="port-group"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network name of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="portGroupId" name="port-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for port group in vmware"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Likely to duplicate value of neutron network name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v11.CvlanTags"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
+                <xml-property name="nameProps" value="port-group-name"/>
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+                <xml-property name="dependentOn" value="vce"/>
+                <xml-property name="container" value="port-groups"/>
+                <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CvlanTags">
+            <xml-root-element name="cvlan-tags"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v11.CvlanTagEntry"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CvlanTagEntry">
+            <xml-root-element name="cvlan-tag-entry"/>
+            <java-attributes>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
+                    </xml-properties>
+                </xml-element>
+                <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="dependentOn" value="port-group"/>
+                <xml-property name="indexedProps" value="cvlan-tag"/>
+                <xml-property name="container" value="cvlan-tags"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="GenericVnfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of VNFs" />
-			</xml-properties>
-			<xml-root-element name="generic-vnfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v11.GenericVnf" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
 
-		<java-type name="GenericVnf">
-			<xml-root-element name="generic-vnf" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="vnf instance id." />
-					</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-property name="suggestibleOnSearch" value="true"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" 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-property name="suggestibleOnSearch" value="true"/>
+        <java-type name="Vnfcs">
+            <xml-properties>
+                <xml-property name="description" value="virtual network components associated with a vserver from application controller."/>
+            </xml-properties>
+            <xml-root-element name="vnfcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v11.Vnfc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vnfc">
+            <xml-root-element name="vnfc"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vnfc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Short code that is used in naming instances of the item being modeled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="prov status of this vnfc"/>
+                    </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, mastered by APP-C"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Oam V4 vip address of this vnfc"/>
+                    </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 default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="groupNotation" name="group-notation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group notation of VNFC"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <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-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"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id"/>
+                <xml-property name="searchable" value="vnfc-name"/>
+                <xml-property name="container" value="vnfcs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vnfcs/vnfc/{vnfc-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="L3Networks">
+            <xml-root-element name="l3-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v11.L3Network"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="L3Network">
+            <xml-root-element name="l3-network"/>
+            <java-attributes>
+                <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network, governed by some naming convention.."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the network - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role the network plans - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network technology - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isBoundToVpn" name="is-bound-to-vpn" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Set to true if bound to VPN"/>
+                    </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 from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="network role instance"/>
+                    </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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered 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="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the network"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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="physicalNetworkName" name="physical-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the physical network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is an external network."/>
+                    </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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v11.Subnets"/>
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v11.CtagAssignments"/>
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v11.SegmentationAssignments"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList">
+                    <xml-properties>
+                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic network definition"/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+                <xml-property name="searchable" value="network-id,network-name"/>
+                <xml-property name="uniqueProps" value="network-id"/>
+                <xml-property name="container" value="l3-networks"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/l3-networks/l3-network/{network-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="NetworkPolicies">
+            <xml-root-element name="network-policies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v11.NetworkPolicy"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="NetworkPolicy">
+            <xml-root-element name="network-policy"/>
+            <java-attributes>
+                <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID representing unique key to this instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the policy"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID for the openStack Heat instance"/>
+                    </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="nameProps" value="network-policy-fqdn"/>
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="uniqueProps" value="network-policy-id"/>
+                <xml-property name="container" value="network-policies"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/network-policies/network-policy/{network-policy-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="CtagAssignments">
+            <xml-root-element name="ctag-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v11.CtagAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CtagAssignment">
+            <xml-root-element name="ctag-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="id."/>
+                    </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="indexedProps" value="vlan-id-inner"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="ctag-assignments"/>
+                <xml-property name="uriTemplate" value="/ctag-assignments/ctag-assignment/{vlan-id-inner}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Subnets">
+            <xml-root-element name="subnets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v11.Subnet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Subnet">
+            <xml-root-element name="subnet"/>
+            <java-attributes>
+                <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Subnet ID, should be UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the subnet."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of this subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="gateway ip address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="network start address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="cidr mask"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version"/>
+                    </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, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="dhcpEnabled" name="dhcp-enabled" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="dhcp enabled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the start address reserved for use by dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the last address reserved for use by dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the subnet, referenced when assigning IPs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip address assignment direction of the subnet"/>
+                    </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="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="sequence of the subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v11.HostRoutes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="subnet-id,subnet-name"/>
+                <xml-property name="nameProps" value="subnet-name"/>
+                <xml-property name="uniqueProps" value="subnet-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="subnets"/>
+                <xml-property name="uriTemplate" value="/subnets/subnet/{subnet-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="GenericVnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VNFs"/>
+            </xml-properties>
+            <xml-root-element name="generic-vnfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v11.GenericVnf"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="GenericVnf">
+            <xml-root-element name="generic-vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vnf instance id." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" 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-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" 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-property name="suggestibleOnSearch" value="true"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vnfPackageName" name="vnf-package-name" required="false" type="java.lang.String">
@@ -4208,2164 +4274,2208 @@
 				<xml-element java-attribute="jobId" name="job-id" required="false" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="job id corresponding to vnf"/>
-					</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 java-attribute="nshd" name="nshd" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="number of associated SHD in vnf." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nvm" name="nvm" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="number of vms in vnf." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nnet" name="nnet" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="number of network in vnf." />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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-property name="suggestibleOnSearch" value="true"/>
-					</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-property name="suggestibleOnSearch" value="true"/>
-					</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="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Gateway address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length for oam-address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Temporary location for S-TAG to get to VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network Management profile of this VNF" />
-					</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" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v11.VfModules" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="General purpose VNF" />
-				<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,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="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-				<xml-property name="containsSuggestibleProps" value="true"/>
-				<xml-property name="suggestionAliases" value="VNFs"/>
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VfModules">
-			<xml-properties>
-				<xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
-			</xml-properties>
-			<xml-root-element name="vf-modules" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v11.VfModule" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VfModule">
-			<xml-root-element name="vf-module" />
-			<java-attributes>
-				<xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of vf-module." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of vf-module" />
-					</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." />
-					</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 vf-module, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" 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 base vf module" />
-					</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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the Contrail unique ID for a service-instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" />
-					</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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="a deployment unit of VNFCs" />
-				<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>
-		</java-type>
-
-
-		<java-type name="LagLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of link aggregation connections" />
-			</xml-properties>
-			<xml-root-element name="lag-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v11.LagLink" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="LagLink">
-			<xml-root-element name="lag-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="LAG links can connect lag-interfaces" />
-				<xml-property name="indexedProps" value="link-name" />
-				<xml-property name="container" value="lag-links" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Newvces">
-			<xml-properties>
-				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-			</xml-properties>
-			<xml-root-element name="newvces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v11.Newvce" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Newvce">
-			<xml-root-element name="newvce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternate name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  do not use" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Client should send valid enumerated value." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-				<xml-property name="nameProps" value="vnf-name" />
-				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" />
-				<xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" />
-				<xml-property name="uniqueProps" value="vnf-id2" />
-				<xml-property name="container" value="newvces" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Pnfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of Physical Network Functions." />
-			</xml-properties>
-			<xml-root-element name="pnfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v11.Pnf" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Pnf">
-			<xml-root-element name="pnf" />
-			<java-attributes>
-				<xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique name of Physical Network Function." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="name of Physical Network Function." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="source of name2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id of pnf" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." />
-					</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 java-attribute="frameId" name="frame-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Serial number of the device" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 OAM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
-					</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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." />
-				<xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status" />
-				<xml-property name="searchable" value="pnf-name" />
-				<xml-property name="uniqueProps" value="pnf-name" />
-				<xml-property name="container" value="pnfs" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="PhysicalLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
-			</xml-properties>
-			<xml-root-element name="physical-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v11.PhysicalLink" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="PhysicalLink">
-			<xml-root-element name="physical-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit it" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Dual access mode (e.g., primary, secondary" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the service Provider on this link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Upstream Bandwidth value agreed with the service provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Units for the upstream BW value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Downstream Bandwidth value agreed with the service provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Units for downstream BW value" />
-					</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="Collection of physical connections, typically between p-interfaces" />
-				<xml-property name="indexedProps" value="circuit-id,link-name" />
-				<xml-property name="alternateKeys1" value="circuit-id" />
-				<xml-property name="container" value="physical-links" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="searchable" value="link-name,circuit-id" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VigServers">
-			<xml-root-element name="vig-servers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v11.VigServer" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VigServer">
-			<xml-root-element name="vig-server" />
-			<java-attributes>
-				<xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" >
-					<xml-properties>
-						<xml-property name="description" value="v4 IP of the vig server" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" >
-					<xml-properties>
-						<xml-property name="description" value="v6 IP of the vig server" />
-					</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="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
-				<xml-property name="indexedProps" value="vig-address-type" />
-				<xml-property name="dependentOn" value="ipsec-configuration" />
-				<xml-property name="container" value="vig-servers" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="IpsecConfigurations">
-			<xml-root-element name="ipsec-configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v11.IpsecConfiguration" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="IpsecConfiguration">
-			<xml-root-element name="ipsec-configuration" />
-			<java-attributes>
-				<xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of this configuration" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network address of shared DMZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="can be 1 or 2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" />
-					</xml-properties>
-				</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-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="pre-shared key for the above group name " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Lifetime for IKEv1 SA" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="md5, sha1, sha256, sha384" />
-					</xml-properties>
-				</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-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Life time for IPSec SA" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="enable PFS or not" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The time between DPD probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" />
-					</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" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v11.VigServers" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
-				<xml-property name="indexedProps" value="ipsec-configuration-id" />
-				<xml-property name="uniqueProps" value="ipsec-configuration-id" />
-				<xml-property name="container" value="ipsec-configurations" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-
-		<java-type name="NotificationEvent">
-			<xml-root-element name="notification-event" />
-			<java-attributes>
-				<xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" />
-				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v11.NotificationEventHeader" />
-				<xml-any-element java-attribute="entity" />
-			</java-attributes>
-		</java-type>
-		<java-type name="NotificationEventHeader">
-			<xml-root-element name="notification-event-header" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" type="java.lang.String" />
-				<xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" />
-				<xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" />
-				<xml-element java-attribute="domain" name="domain" type="java.lang.String" />
-				<xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" />
-				<xml-element java-attribute="severity" name="severity" type="java.lang.String" />
-				<xml-element java-attribute="eventType" name="event-type" type="java.lang.String" />
-				<xml-element java-attribute="version" name="version" type="java.lang.String" />
-				<xml-element java-attribute="action" name="action" type="java.lang.String" />
-				<xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" />
-				<xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" />
-				<xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" />
-				<xml-element java-attribute="status" name="status" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-		<java-type name="AaiInternal">
-			<xml-root-element name="aai-internal" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v11.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v11.EdgePropNames" />
-			</java-attributes>
-		</java-type>
-		<java-type name="ReservedPropNames">
-			<xml-properties>
-				<xml-property name="description" value="Internal map to define some reserved properties of a vertex" />
-				<xml-property name="uniqueProps" value="aai-unique-key" />
-				<xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri" />
-			</xml-properties>
-			<xml-root-element name="reserved-prop-names" />
-			<java-attributes>
-				<xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" />
-				<xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String" />
-				<xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" />
-				<xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" />
-				<xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" />
-				<xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" />
-				<xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-		<java-type name="EdgePropNames">
-			<!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
-			<xml-properties>
-				<xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" />
-				<xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
-			</xml-properties>
-			<xml-root-element name="edge-prop-names" />
-			<java-attributes>
-				<xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
-				<xml-element java-attribute="direction" name="direction" type="java.lang.String" />
-				<xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
-				<xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String" />
-				<xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String" />
-				<xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String" />
-				<xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Models">
-			<xml-properties>
-				<xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" />
-			</xml-properties>
-			<xml-root-element name="models" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v11.Model" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Model">
-			<xml-root-element name="model" />
-			<xml-properties>
-				<xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version" />
-				<xml-property name="nameProps" value="model-type" />
-				<xml-property name="indexedProps" value="model-invariant-id,model-type" />
-				<xml-property name="uniqueProps" value="model-invariant-id" />
-				<xml-property name="container" value="models" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
-					</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="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-		</java-type>
-
-
-		<java-type name="ModelVers">
-			<xml-root-element name="model-vers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v11.ModelVer" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ModelVer">
-			<xml-root-element name="model-ver" />
-			<xml-properties>
-				<xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" />
-				<xml-property name="nameProps" value="model-name" />
-				<xml-property name="indexedProps" value="model-version-id,model-name,model-version" />
-				<xml-property name="uniqueProps" value="model-version-id" />
-				<xml-property name="container" value="model-vers" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the model, which can change from version to version." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description" />
-					</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="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ModelElements">
-			<xml-root-element name="model-elements" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v11.ModelElement" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ModelElement">
-			<xml-properties>
-				<xml-property name="description" value="Defines how other models combine to make up a higher-level model." />
-				<xml-property name="uniqueProps" value="model-element-uuid" />
-				<xml-property name="indexedProps" value="model-element-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="model-elements" />
-			</xml-properties>
-			<xml-root-element name="model-element" />
-			<java-attributes>
-				<xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="How many of this type of element are required/allowed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" >
-				</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="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements">
-					<xml-properties>
-						<xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v11.ModelConstraints">
-					<xml-properties>
-						<xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ModelConstraints">
-			<xml-root-element name="model-constraints" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v11.ModelConstraint" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ModelConstraint">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="model-constraint-uuid" />
-				<xml-property name="indexedProps" value="model-constraint-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="model-constraints" />
-			</xml-properties>
-			<xml-root-element name="model-constraint" />
-			<java-attributes>
-				<xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v11.ConstrainedElementSets" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ConstrainedElementSets">
-			<xml-root-element name="constrained-element-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v11.ConstrainedElementSet" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ConstrainedElementSet">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="constrained-element-set-uuid" />
-				<xml-property name="indexedProps" value="constrained-element-set-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="constrained-element-sets" />
-			</xml-properties>
-			<xml-root-element name="constrained-element-set" />
-			<java-attributes>
-				<xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v11.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ElementChoiceSets">
-			<xml-root-element name="element-choice-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v11.ElementChoiceSet" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ElementChoiceSet">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="element-choice-set-uuid" />
-				<xml-property name="indexedProps" value="element-choice-set-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="element-choice-sets" />
-			</xml-properties>
-			<xml-root-element name="element-choice-set" />
-			<java-attributes>
-				<xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="NamedQueries">
-			<xml-root-element name="named-queries" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="NamedQuery">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="nameProps" value="named-query-name" />
-				<xml-property name="uniqueProps" value="named-query-uuid" />
-				<xml-property name="indexedProps" value="named-query-uuid,named-query-name" />
-				<xml-property name="container" value="named-queries" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-			<xml-root-element name="named-query" />
-			<java-attributes>
-				<xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String" >
-					<xml-element-wrapper name="required-input-params" />
-				</xml-element>
-				<xml-element java-attribute="description" name="description" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="NamedQueryElements">
-			<xml-root-element name="named-query-elements" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v11.NamedQueryElement" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="NamedQueryElement">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="uniqueProps" value="named-query-element-uuid" />
-				<xml-property name="indexedProps" value="named-query-element-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="named-query-elements" />
-			</xml-properties>
-			<xml-root-element name="named-query-element" />
-			<java-attributes>
-				<xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
-				<xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v11.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v11.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="RelatedLookups">
-			<xml-root-element name="related-lookups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v11.RelatedLookup" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="RelatedLookup">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="uniqueProps" value="related-lookup-uuid" />
-				<xml-property name="indexedProps" value="related-lookup-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="related-lookups" />
-			</xml-properties>
-			<xml-root-element name="related-lookup" />
-			<java-attributes>
-				<xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="PropertyConstraints">
-			<xml-root-element name="property-constraints" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v11.PropertyConstraint" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="PropertyConstraint">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="uniqueProps" value="property-constraint-uuid" />
-				<xml-property name="indexedProps" value="property-constraint-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="property-constraints" />
-			</xml-properties>
-			<xml-root-element name="property-constraint" />
-			<java-attributes>
-				<xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ModelAndNamedQuerySearch">
-			<xml-properties>
-				<xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="model-and-named-query-search" />
-			<java-attributes>
-				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v11.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v11.InstanceFilters" />
-				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v11.SecondaryFilts" />
-				<xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" />
-				<xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="QueryParameters">
-			<xml-properties>
-				<xml-property name="description" value="QueryParameters for performing a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="query-parameters" />
-			<java-attributes>
-				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v11.OverloadedModel" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="OverloadedModel">
-			<xml-root-element name="overloaded-model" />
-			<xml-properties>
-				<xml-property name="description" value="Allows for legacy POST of old-style and new-style models" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the model, which can change from version to version." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Invariant unique ID which does not change from version to version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description" />
-					</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="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-		</java-type>
+                    </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 java-attribute="nshd" name="nshd" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of associated SHD in vnf." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nvm" name="nvm" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of vms in vnf." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nnet" name="nnet" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of network in vnf." />
+                    </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). 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" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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-property name="suggestibleOnSearch" value="true"/>
+                    </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-property name="suggestibleOnSearch" value="true"/>
+                    </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="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gateway address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length for oam-address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for S-TAG to get to VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network Management profile of this VNF"/>
+                    </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"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces"/>
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v11.VfModules"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose VNF"/>
+                <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,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="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="containsSuggestibleProps" value="true"/>
+                <xml-property name="suggestionAliases" value="VNFs"/>
+                <xml-property name="uriTemplate" value="/network/generic-vnfs/generic-vnf/{vnf-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VfModules">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs"/>
+            </xml-properties>
+            <xml-root-element name="vf-modules"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v11.VfModule"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VfModule">
+            <xml-root-element name="vf-module"/>
+            <java-attributes>
+                <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vf-module."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vf-module"/>
+                    </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."/>
+                    </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 vf-module, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isBaseVfModule" name="is-base-vf-module" 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 base vf module"/>
+                    </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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the Contrail unique ID for a service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit"/>
+                    </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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="a deployment unit of VNFCs"/>
+                <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-property name="uriTemplate" value="/vf-modules/vf-module/{vf-module-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="InstanceFilters">
-			<xml-properties>
-				<xml-property name="description" value="InstanceFilters for performing a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="instance-filters" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v11.InstanceFilter" />
-			</java-attributes>
-		</java-type>
 
-		<java-type name="InstanceFilter">
-			<xml-properties>
-				<xml-property name="description" value="InstanceFilter for performing a named-query or model query" />
-				<xml-property name="container" value="instance-filters" />
-			</xml-properties>
-			<xml-root-element name="instance-filter" />
-			<java-attributes>
-				<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-properties>
-			<xml-root-element name="secondary-filts" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.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-properties>
-			<xml-root-element name="secondary-filt" />
-			<java-attributes>
-				<xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
-			</java-attributes>
-		</java-type>
+        <java-type name="LagLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregation connections"/>
+            </xml-properties>
+            <xml-root-element name="lag-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v11.LagLink"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LagLink">
+            <xml-root-element name="lag-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="LAG links can connect lag-interfaces"/>
+                <xml-property name="indexedProps" value="link-name"/>
+                <xml-property name="container" value="lag-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/lag-links/lag-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Newvces">
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+            </xml-properties>
+            <xml-root-element name="newvces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v11.Newvce"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Newvce">
+            <xml-root-element name="newvce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2"/>
+                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id2"/>
+                <xml-property name="container" value="newvces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/newvces/newvce/{vnf-id2}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Physical Network Functions."/>
+            </xml-properties>
+            <xml-root-element name="pnfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v11.Pnf"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pnf">
+            <xml-root-element name="pnf"/>
+            <java-attributes>
+                <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique name of Physical Network Function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name of Physical Network Function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="source of name2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of pnf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF."/>
+                    </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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number of the device"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                    </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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
+                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status"/>
+                <xml-property name="searchable" value="pnf-name"/>
+                <xml-property name="uniqueProps" value="pnf-name"/>
+                <xml-property name="container" value="pnfs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/pnfs/pnf/{pnf-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PhysicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+            </xml-properties>
+            <xml-root-element name="physical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v11.PhysicalLink"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PhysicalLink">
+            <xml-root-element name="physical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit it"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the service Provider on this link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for the upstream BW value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for downstream BW value"/>
+                    </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="Collection of physical connections, typically between p-interfaces"/>
+                <xml-property name="indexedProps" value="circuit-id,link-name"/>
+                <xml-property name="alternateKeys1" value="circuit-id"/>
+                <xml-property name="container" value="physical-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="searchable" value="link-name,circuit-id"/>
+                <xml-property name="uriTemplate" value="/network/physical-links/physical-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VigServers">
+            <xml-root-element name="vig-servers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v11.VigServer"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VigServer">
+            <xml-root-element name="vig-server"/>
+            <java-attributes>
+                <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4 IP of the vig server"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v6 IP of the vig server"/>
+                    </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="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607"/>
+                <xml-property name="indexedProps" value="vig-address-type"/>
+                <xml-property name="dependentOn" value="ipsec-configuration"/>
+                <xml-property name="container" value="vig-servers"/>
+                <xml-property name="uriTemplate" value="/vig-servers/vig-server/{vig-address-type}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="IpsecConfigurations">
+            <xml-root-element name="ipsec-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v11.IpsecConfiguration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="IpsecConfiguration">
+            <xml-root-element name="ipsec-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of this configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network address of shared DMZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="can be 1 or 2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384"/>
+                    </xml-properties>
+                </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-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="pre-shared key for the above group name "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Lifetime for IKEv1 SA"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="md5, sha1, sha256, sha384"/>
+                    </xml-properties>
+                </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-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Life time for IPSec SA"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="enable PFS or not"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The time between DPD probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down"/>
+                    </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"/>
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v11.VigServers"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
+                <xml-property name="indexedProps" value="ipsec-configuration-id"/>
+                <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
+                <xml-property name="container" value="ipsec-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}"/>
+            </xml-properties>
+        </java-type>
+
+
+        <java-type name="NotificationEvent">
+            <xml-root-element name="notification-event"/>
+            <java-attributes>
+                <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String"/>
+                <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v11.NotificationEventHeader"/>
+                <xml-any-element java-attribute="entity"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="NotificationEventHeader">
+            <xml-root-element name="notification-event-header"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" type="java.lang.String"/>
+                <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String"/>
+                <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String"/>
+                <xml-element java-attribute="domain" name="domain" type="java.lang.String"/>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String"/>
+                <xml-element java-attribute="severity" name="severity" type="java.lang.String"/>
+                <xml-element java-attribute="eventType" name="event-type" type="java.lang.String"/>
+                <xml-element java-attribute="version" name="version" type="java.lang.String"/>
+                <xml-element java-attribute="action" name="action" type="java.lang.String"/>
+                <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String"/>
+                <xml-element java-attribute="status" name="status" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="AaiInternal">
+            <xml-root-element name="aai-internal"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v11.ReservedPropNames"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v11.EdgePropNames"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ReservedPropNames">
+            <xml-properties>
+                <xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
+                <xml-property name="uniqueProps" value="aai-unique-key"/>
+                <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
+            </xml-properties>
+            <xml-root-element name="reserved-prop-names"/>
+            <java-attributes>
+                <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String"/>
+                <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long"/>
+                <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String"/>
+                <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long"/>
+                <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String"/>
+                <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="EdgePropNames">
+            <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
+            <xml-properties>
+                <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules"/>
+                <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV"/>
+            </xml-properties>
+            <xml-root-element name="edge-prop-names"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String"/>
+                <xml-element java-attribute="direction" name="direction" type="java.lang.String"/>
+                <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String"/>
+                <xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String"/>
+                <xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String"/>
+                <xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String"/>
+                <xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Models">
+            <xml-properties>
+                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models"/>
+            </xml-properties>
+            <xml-root-element name="models"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v11.Model"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Model">
+            <xml-root-element name="model"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version"/>
+                <xml-property name="nameProps" value="model-type"/>
+                <xml-property name="indexedProps" value="model-invariant-id,model-type"/>
+                <xml-property name="uniqueProps" value="model-invariant-id"/>
+                <xml-property name="container" value="models"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/models/model/{model-invariant-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                    </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="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Properties">
-			<xml-properties>
-				<xml-property name="description" value="Property holder for query properties or instance properties" />
-			</xml-properties>
-			<xml-root-element name="properties" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
 
-		<java-type name="ResponseList">
-			<xml-properties>
-				<xml-property name="description" value="Response container for the results of a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="response-list" />
-			<java-attributes>
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelVers">
+            <xml-root-element name="model-vers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v11.ModelVer"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="InventoryResponseItems">
-			<xml-properties>
-				<xml-property name="description" value="Container for inventory items in response list" />
-				<xml-property name="container" value="response-list" />
-			</xml-properties>
-			<xml-root-element name="inventory-response-items" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v11.InventoryResponseItem" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelVer">
+            <xml-root-element name="model-ver"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models"/>
+                <xml-property name="nameProps" value="model-name"/>
+                <xml-property name="indexedProps" value="model-version-id,model-name,model-version"/>
+                <xml-property name="uniqueProps" value="model-version-id"/>
+                <xml-property name="container" value="model-vers"/>
+                <xml-property name="uriTemplate" value="/model-vers/model-ver/{model-version-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description"/>
+                    </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="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelElements">
+            <xml-root-element name="model-elements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v11.ModelElement"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelElement">
+            <xml-properties>
+                <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
+                <xml-property name="uniqueProps" value="model-element-uuid"/>
+                <xml-property name="indexedProps" value="model-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-elements"/>
+                <xml-property name="uriTemplate" value="/model-elements/model-element/{model-element-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="model-element"/>
+            <java-attributes>
+                <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many of this type of element are required/allowed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String">
+                </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="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements">
+                    <xml-properties>
+                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v11.ModelConstraints">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelConstraints">
+            <xml-root-element name="model-constraints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v11.ModelConstraint"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelConstraint">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="model-constraint-uuid"/>
+                <xml-property name="indexedProps" value="model-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-constraints"/>
+                <xml-property name="uriTemplate" value="/model-constraints/model-constraint/{model-constraint-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="model-constraint"/>
+            <java-attributes>
+                <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v11.ConstrainedElementSets"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="InventoryResponseItem">
-			<xml-properties>
-				<xml-property name="description" value="Inventory item for response list" />
-				<xml-property name="container" value="inventory-response-items" />
-			</xml-properties>
-			<xml-root-element name="inventory-response-item" />
-			<java-attributes>
-				<xml-element java-attribute="modelName" name="model-name" type="java.lang.String" />
-				<xml-any-element java-attribute="item" />
-				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v11.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ConstrainedElementSets">
+            <xml-root-element name="constrained-element-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v11.ConstrainedElementSet"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ExtraProperties">
-			<xml-properties>
-				<xml-property name="description" value="Extra properties for inventory item for response list" />
-			</xml-properties>
-			<xml-root-element name="extra-properties" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v11.ExtraProperty" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ConstrainedElementSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
+                <xml-property name="indexedProps" value="constrained-element-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="constrained-element-sets"/>
+                <xml-property name="uriTemplate" value="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="constrained-element-set"/>
+            <java-attributes>
+                <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v11.ElementChoiceSets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ElementChoiceSets">
+            <xml-root-element name="element-choice-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v11.ElementChoiceSet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ElementChoiceSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
+                <xml-property name="indexedProps" value="element-choice-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="element-choice-sets"/>
+                <xml-property name="uriTemplate" value="/element-choice-sets/element-choice-set/{element-choice-set-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="element-choice-set"/>
+            <java-attributes>
+                <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NamedQueries">
+            <xml-root-element name="named-queries"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NamedQuery">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="nameProps" value="named-query-name"/>
+                <xml-property name="uniqueProps" value="named-query-uuid"/>
+                <xml-property name="indexedProps" value="named-query-uuid,named-query-name"/>
+                <xml-property name="container" value="named-queries"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/named-queries/named-query/{named-query-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="named-query"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String">
+                    <xml-element-wrapper name="required-input-params"/>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NamedQueryElements">
+            <xml-root-element name="named-query-elements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v11.NamedQueryElement"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NamedQueryElement">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="named-query-element-uuid"/>
+                <xml-property name="indexedProps" value="named-query-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="named-query-elements"/>
+                <xml-property name="uriTemplate" value="/named-query-elements/named-query-element/{named-query-element-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="named-query-element"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String"/>
+                <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements"/>
+                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v11.RelatedLookups"/>
+                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v11.PropertyConstraints"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelatedLookups">
+            <xml-root-element name="related-lookups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v11.RelatedLookup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelatedLookup">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="related-lookup-uuid"/>
+                <xml-property name="indexedProps" value="related-lookup-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="related-lookups"/>
+                <xml-property name="uriTemplate" value="/related-lookups/related-lookup/{related-lookup-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="related-lookup"/>
+            <java-attributes>
+                <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PropertyConstraints">
+            <xml-root-element name="property-constraints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v11.PropertyConstraint"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PropertyConstraint">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="property-constraint-uuid"/>
+                <xml-property name="indexedProps" value="property-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="property-constraints"/>
+                <xml-property name="uriTemplate" value="/property-constraints/property-constraint/{property-constraint-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="property-constraint"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelAndNamedQuerySearch">
+            <xml-properties>
+                <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="model-and-named-query-search"/>
+            <java-attributes>
+                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v11.QueryParameters"/>
+                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v11.InstanceFilters"/>
+                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v11.SecondaryFilts"/>
+                <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="QueryParameters">
+            <xml-properties>
+                <xml-property name="description" value="QueryParameters for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="query-parameters"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery"/>
+                <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v11.OverloadedModel"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OverloadedModel">
+            <xml-root-element name="overloaded-model"/>
+            <xml-properties>
+                <xml-property name="description" value="Allows for legacy POST of old-style and new-style models"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Invariant unique ID which does not change from version to version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description"/>
+                    </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="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ExtraProperty">
-			<xml-root-element name="extra-property" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="RouteTableReferences">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack route table references" />
-			</xml-properties>
-			<xml-root-element name="route-table-references" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v11.RouteTableReference" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="RouteTableReference">
-			<xml-root-element name="route-table-reference" />
-			<java-attributes>
-				<xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="FQDN entry in the route table." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</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="Openstack route table reference." />
-				<xml-property name="nameProps" value="route-table-reference-fqdn" />
-				<xml-property name="uniqueProps" value="route-table-reference-id" />
-				<xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" />
-				<xml-property name="container" value="route-table-references" />
-				<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-properties>
-			<xml-root-element name="instance-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v11.InstanceGroup" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="InstanceGroup">
-			<xml-root-element name="instance-group" />
-			<java-attributes>
-				<xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role of the instance group." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="InstanceFilters">
+            <xml-properties>
+                <xml-property name="description" value="InstanceFilters for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="instance-filters"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v11.InstanceFilter"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InstanceFilter">
+            <xml-properties>
+                <xml-property name="description" value="InstanceFilter for performing a named-query or model query"/>
+                <xml-property name="container" value="instance-filters"/>
+            </xml-properties>
+            <xml-root-element name="instance-filter"/>
+            <java-attributes>
+                <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-properties>
+            <xml-root-element name="secondary-filts"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.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-properties>
+            <xml-root-element name="secondary-filt"/>
+            <java-attributes>
+                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Properties">
+            <xml-properties>
+                <xml-property name="description" value="Property holder for query properties or instance properties"/>
+            </xml-properties>
+            <xml-root-element name="properties"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ResponseList">
+            <xml-properties>
+                <xml-property name="description" value="Response container for the results of a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="response-list"/>
+            <java-attributes>
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InventoryResponseItems">
+            <xml-properties>
+                <xml-property name="description" value="Container for inventory items in response list"/>
+                <xml-property name="container" value="response-list"/>
+            </xml-properties>
+            <xml-root-element name="inventory-response-items"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v11.InventoryResponseItem"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InventoryResponseItem">
+            <xml-properties>
+                <xml-property name="description" value="Inventory item for response list"/>
+                <xml-property name="container" value="inventory-response-items"/>
+            </xml-properties>
+            <xml-root-element name="inventory-response-item"/>
+            <java-attributes>
+                <xml-element java-attribute="modelName" name="model-name" type="java.lang.String"/>
+                <xml-any-element java-attribute="item"/>
+                <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v11.ExtraProperties"/>
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ExtraProperties">
+            <xml-properties>
+                <xml-property name="description" value="Extra properties for inventory item for response list"/>
+            </xml-properties>
+            <xml-root-element name="extra-properties"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v11.ExtraProperty"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ExtraProperty">
+            <xml-root-element name="extra-property"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RouteTableReferences">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="route-table-references"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v11.RouteTableReference"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RouteTableReference">
+            <xml-root-element name="route-table-reference"/>
+            <java-attributes>
+                <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="FQDN entry in the route table."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
 
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ASDC model id for this resource or service model." />
-					</xml-properties>
-				</xml-element>
+            <xml-properties>
+                <xml-property name="description" value="Openstack route table reference."/>
+                <xml-property name="nameProps" value="route-table-reference-fqdn"/>
+                <xml-property name="uniqueProps" value="route-table-reference-id"/>
+                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+                <xml-property name="container" value="route-table-references"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/route-table-references/route-table-reference/{route-table-reference-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="InstanceGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="instance-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v11.InstanceGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InstanceGroup">
+            <xml-root-element name="instance-group"/>
+            <java-attributes>
+                <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the instance group."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model version uid for this resource model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Only valid value today is lower case ha for high availability"/>
+                        <xml-property name="dbAlias" value="instance-group-type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subType" name="sub-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
 
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ASDC model version uid for this resource model." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Only valid value today is lower case ha for high availability" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subType" name="sub-type"  type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</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="General mechanism for grouping instances" />
-				<xml-property name="nameProps" value="description" />
-				<xml-property name="uniqueProps" value="id" />
-				<xml-property name="searchable" value="id,description"/>
-				<xml-property name="indexedProps" value="id,description,type,sub-type" />
-				<xml-property name="container" value="instance-groups" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		
+            <xml-properties>
+                <xml-property name="description" value="General mechanism for grouping instances"/>
+                <xml-property name="nameProps" value="description"/>
+                <xml-property name="uniqueProps" value="id"/>
+                <xml-property name="searchable" value="id,description"/>
+                <xml-property name="indexedProps" value="id,description,type,sub-type"/>
+                <xml-property name="container" value="instance-groups"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
+            </xml-properties>
+        </java-type>
+
+
+        <java-type name="SegmentationAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack segmentation assignments"/>
+            </xml-properties>
+            <xml-root-element name="segmentation-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v11.SegmentationAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SegmentationAssignment">
+            <xml-root-element name="segmentation-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </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="Openstack segmentation assignment."/>
+                <xml-property name="indexedProps" value="segmentation-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="segmentation-assignments"/>
+                <xml-property name="uriTemplate" value="/segmentation-assignments/segmentation-assignment/{segmentation-id}"/>
+            </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-properties>
+            <xml-root-element name="allotted-resources"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v11.AllottedResource"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AllottedResource">
+            <xml-root-element name="allotted-resource"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Link back to more information in the controller"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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-properties>
+                        <xml-property name="description" value="Concurrency 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"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Generic description of the type of allotted resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role in the network that this resource will be providing."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v11.TunnelXconnects"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
 
-		<java-type name="SegmentationAssignments">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack segmentation assignments" />
-			</xml-properties>
-			<xml-root-element name="segmentation-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v11.SegmentationAssignment" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="SegmentationAssignment">
-			<xml-root-element name="segmentation-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</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="Openstack segmentation assignment." />
-				<xml-property name="indexedProps" value="segmentation-id" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<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-properties>
-			<xml-root-element name="allotted-resources" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v11.AllottedResource" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="AllottedResource">
-			<xml-root-element name="allotted-resource" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="description" name="description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The descriptive information assigned to this allotted resource instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Link back to more information in the controller" />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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-properties>
-						<xml-property name="description" value="Concurrency 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" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="type" name="type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Generic description of the type of allotted resource." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="role" name="role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role in the network that this resource will be providing." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.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,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 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-properties>
-			<xml-root-element name="tunnel-xconnects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v11.TunnelXconnect" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="TunnelXconnect">
-			<xml-root-element name="tunnel-xconnect" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN uplink bandwidth for WAN1" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN downlink bandwidth for WAN1" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN uplink bandwidth for WAN2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN downlink bandwidth for WAN2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</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="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="indexedProps" value="id" />
-				<xml-property name="dependentOn" value="allotted-resource" />
-				<xml-property name="container" value="tunnel-xconnects" />
-				<!--  <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-properties>
-			<xml-root-element name="entitlements" />
-			<java-attributes>
-				<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-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of an entitlement resource. " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</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="Metadata for entitlement group." />
-				<xml-property name="indexedProps" value="group-uuid,resource-uuid" />
-				<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-properties>
-			<xml-root-element name="licenses" />
-			<java-attributes>
-				<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-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of a license resource. " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</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="Metadata for license group." />
-				<xml-property name="indexedProps" value="group-uuid,resource-uuid" />
-				<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-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Abstract vnf class" />
-				<xml-property name="indexedProps" value="vnf-id" />
-				<xml-property name="uniqueProps" value="vnf-id" />
-				<xml-property name="inheritors" value="vce,generic-vnf" />
-				<xml-property name="abstract" value="true" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="Zones">
-			<xml-properties>
-				<xml-property name="description" value="Collection of zones" />
-			</xml-properties>
-			<xml-root-element name="zones" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v11.Zone" />
-			</java-attributes>
-		</java-type>
+            <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,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-property name="uriTemplate" value="/allotted-resources/allotted-resource/{id}"/>
+            </xml-properties>
+        </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-properties>
+            <xml-root-element name="tunnel-xconnects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v11.TunnelXconnect"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="TunnelXconnect">
+            <xml-root-element name="tunnel-xconnect"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN1"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN1"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
 
-		<java-type name="Zone">
-			<xml-root-element name="zone" />
-			<java-attributes>
-				<xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Code assigned by AIC to the zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="English name associated with the zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Design of zone [Medium/Large?]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Context of zone [production/test]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="status" name="status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Status of a zone." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</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="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
-				<xml-property name="nameProps" value="zone-name" />
-				<xml-property name="indexedProps" value="zone-id,design-type,zone-context" />
-				<xml-property name="uniqueProps" value="zone-id" />
-				<xml-property name="container" value="zones" />
-				<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="dependentOn" value="vpn-binding" />
-				<xml-property name="canBeLinked" value="true" />
-			</xml-properties>
-		</java-type>
-						
-		<java-type name="SriovPfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of SR-IOV Physical Functions." />
-			</xml-properties>
-			<xml-root-element name="sriov-pfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v11.SriovPf" />
-			</java-attributes>
-		</java-type>
-		<java-type name="SriovPf">
-			<xml-root-element name="sriov-pf" />
-			<java-attributes>
-				<xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Identifier for the sriov-pf" />
-					</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="SR-IOV Physical Function" />
-				<xml-property name="indexedProps" value="pf-pci-id" />
-				<xml-property name="dependentOn" value="p-interface" />
-				<xml-property name="container" value="sriov-pfs" />
-			</xml-properties>
-		</java-type>
+            <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="indexedProps" value="id"/>
+                <xml-property name="dependentOn" value="allotted-resource"/>
+                <xml-property name="container" value="tunnel-xconnects"/>
+                <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/tunnel-xconnects/tunnel-xconnect/{id}"/>
+            </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-properties>
+            <xml-root-element name="entitlements"/>
+            <java-attributes>
+                <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-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of an entitlement resource. "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </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="Metadata for entitlement group."/>
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid"/>
+                <xml-property name="dependentOn" value="generic-vnf,vce"/>
+                <xml-property name="container" value="entitlements"/>
+                <xml-property name="uriTemplate" value="/entitlements/entitlement/{group-uuid}/{resource-uuid}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="HostRoutes">
-			<xml-root-element name="host-routes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v11.HostRoute" />
-			</java-attributes>
-		</java-type>
-		<java-type name="HostRoute">
-			<xml-root-element name="host-route" />
-			<java-attributes>
-				<xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="host-route id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="subnet prefix" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Could be ip-address, hostname, or service-instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop" />
-					</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="indexedProps" value="host-route-id" />
-				<xml-property name="dependentOn" value="subnet" />
-				<xml-property name="container" value="host-routes" />
-			</xml-properties>
-		</java-type>
-		<java-type name="VipIpv4AddressList">
-			<xml-root-element name="vip-ipv4-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 32 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv4 Address Range" />
-				<xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-			</xml-properties>
-		</java-type>
 
-		<java-type name="VipIpv6AddressList">
-			<xml-root-element name="vip-ipv6-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 128 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv6 Address Range" />
-				<xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-			</xml-properties>
-		</java-type>
-	</java-types>
+        <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-properties>
+            <xml-root-element name="licenses"/>
+            <java-attributes>
+                <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-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of a license resource. "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </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="Metadata for license group."/>
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid"/>
+                <xml-property name="dependentOn" value="generic-vnf,vce"/>
+                <xml-property name="container" value="licenses"/>
+                <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vnf">
+            <xml-root-element name="vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Abstract vnf class"/>
+                <xml-property name="indexedProps" value="vnf-id"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="inheritors" value="vce,generic-vnf"/>
+                <xml-property name="abstract" value="true"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Zones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of zones"/>
+            </xml-properties>
+            <xml-root-element name="zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v11.Zone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Zone">
+            <xml-root-element name="zone"/>
+            <java-attributes>
+                <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Code assigned by AIC to the zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English name associated with the zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Design of zone [Medium/Large?]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Context of zone [production/test]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status of a zone."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </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="A zone is a grouping of assets in a location homing to the same connections into the CBB"/>
+                <xml-property name="nameProps" value="zone-name"/>
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context"/>
+                <xml-property name="uniqueProps" value="zone-id"/>
+                <xml-property name="container" value="zones"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
+            </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" type="java.lang.String" xml-key="true">
+                    <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" type="java.lang.String" xml-key="true">
+                    <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="dependentOn" value="vpn-binding"/>
+                <xml-property name="canBeLinked" value="true"/>
+                <xml-property name="uriTemplate" value="/route-targets/route-target/{global-route-target}/{route-target-role}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SriovPfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Physical Functions."/>
+            </xml-properties>
+            <xml-root-element name="sriov-pfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v11.SriovPf"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovPf">
+            <xml-root-element name="sriov-pf"/>
+            <java-attributes>
+                <xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier for the sriov-pf"/>
+                    </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="SR-IOV Physical Function"/>
+                <xml-property name="indexedProps" value="pf-pci-id"/>
+                <xml-property name="dependentOn" value="p-interface"/>
+                <xml-property name="container" value="sriov-pfs"/>
+                <xml-property name="uriTemplate" value="/sriov-pfs/sriov-pf/{pf-pci-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="HostRoutes">
+            <xml-root-element name="host-routes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v11.HostRoute"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="HostRoute">
+            <xml-root-element name="host-route"/>
+            <java-attributes>
+                <xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="host-route id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="subnet prefix"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop"/>
+                    </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="indexedProps" value="host-route-id"/>
+                <xml-property name="dependentOn" value="subnet"/>
+                <xml-property name="container" value="host-routes"/>
+                <xml-property name="uriTemplate" value="/host-routes/host-route/{host-route-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="VipIpv4AddressList">
+            <xml-root-element name="vip-ipv4-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+            <xml-property name="uriTemplate" value="/vip-ipv4-address-list/{vip-ipv4-address}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VipIpv6AddressList">
+            <xml-root-element name="vip-ipv6-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+            <xml-property name="uriTemplate" value="/vip-ipv6-address-list/{vip-ipv6-address}"/>
+            </xml-properties>
+        </java-type>
+    </java-types>
 </xml-bindings>
diff --git a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml
index 315d01d1..e04c471a 100644
--- a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml
@@ -18,213 +18,212 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-
 <xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v12" xml-mapping-metadata-complete="true">
-	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.onap.aai.inventory/v12" />
-	</xml-schema>
-	<java-types>
-		<java-type name="Inventory">
-			<xml-root-element name="inventory" />
-			<java-attributes>
-				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v12.Search" />
-				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v12.Actions" />
-				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v12.CloudInfrastructure" />
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v12"/>
+    </xml-schema>
+    <java-types>
+        <java-type name="Inventory">
+            <xml-root-element name="inventory"/>
+            <java-attributes>
+                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v12.Search"/>
+                <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v12.Actions"/>
+                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v12.CloudInfrastructure"/>
 				<xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v12.ExternalSystem" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v12.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v12.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v12.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v12.AaiInternal" />
-				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v12.Nodes"/>
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Nodes">
-			<xml-root-element name="nodes" />
-		</java-type>
-		<java-type name="Search">
-			<xml-root-element name="search" />
-			<java-attributes>
-				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v12.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v12.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v12.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v12.SdnZoneResponse" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="EdgeTagQueryResult">
-			<xml-root-element name="edge-tag-query-result" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v12.TaggedInventoryItemList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="TaggedInventoryItemList">
-			<xml-root-element name="tagged-inventory-item-list" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v12.InventoryItem" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="InventoryItem">
-			<xml-root-element name="inventory-item" />
-			<java-attributes>
-				<xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" />
-				<xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v12.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v12.TaggedInventoryItemList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="InventoryItemData">
-			<xml-root-element name="inventory-item-data" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="EdgeTagQueryRequest">
-			<xml-root-element name="edge-tag-query-request" />
-			<java-attributes>
-				<xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" />
-				<xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" />
-				<xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v12.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v12.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v12.SecondaryFilter" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="StartNodeFilter">
-			<xml-root-element name="start-node-filter" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="IncludeNodeFilter">
-			<xml-root-element name="include-node-filter" />
-			<java-attributes>
-				<xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SecondaryFilter">
-			<xml-root-element name="secondary-filter" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="filterType" name="filter-type" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SearchResults">
-			<xml-root-element name="search-results" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v12.ResultData" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ResultData">
-			<xml-root-element name="result-data" />
-			<java-attributes>
-				<xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The specific type of node in the A&amp;AI graph" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The URL to the specific resource" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SdnZoneResponse">
-			<xml-root-element name="sdn-zone-response" />
-			<java-attributes>
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v12.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v12.AzAndDvsSwitches" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="AzAndDvsSwitches">
-			<xml-root-element name="az-and-dvs-switches" />
-			<java-attributes>
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v12.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v12.AvailabilityZone" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Actions">
-			<xml-properties>
-				<xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)." />
-			</xml-properties>
-			<xml-root-element name="actions" />
-			<java-attributes>
-				<xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v12.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v12.Notify" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Update">
-			<xml-properties>
-				<xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team." />
-			</xml-properties>
-			<xml-root-element name="update" />
-			<java-attributes>
-				<xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v12.UpdateNodeKey" />
-				<xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v12.Action" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Action">
-			<xml-root-element name="action" />
-			<java-attributes>
-				<xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v12.ActionData" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ActionData">
-			<xml-root-element name="action-data" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="UpdateNodeKey">
-			<xml-root-element name="update-node-key" />
-			<java-attributes>
-				<xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
-				<xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Notify">
-			<xml-root-element name="notify" />
-			<java-attributes>
-				<xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" />
-				<xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" />
-				<xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v12.KeyData" />
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="KeyData">
-			<xml-root-element name="key-data" />
-			<java-attributes>
-				<xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
-				<xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v12.Business"/>
+                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v12.ServiceDesignAndCreation"/>
+                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v12.Network"/>
+                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v12.AaiInternal"/>
+                <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v12.Nodes"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Nodes">
+            <xml-root-element name="nodes"/>
+        </java-type>
+        <java-type name="Search">
+            <xml-root-element name="search"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v12.EdgeTagQueryResult"/>
+                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v12.EdgeTagQueryRequest"/>
+                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v12.SearchResults"/>
+                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v12.SdnZoneResponse"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="EdgeTagQueryResult">
+            <xml-root-element name="edge-tag-query-result"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v12.TaggedInventoryItemList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="TaggedInventoryItemList">
+            <xml-root-element name="tagged-inventory-item-list"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v12.InventoryItem"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InventoryItem">
+            <xml-root-element name="inventory-item"/>
+            <java-attributes>
+                <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String"/>
+                <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v12.InventoryItemData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v12.TaggedInventoryItemList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InventoryItemData">
+            <xml-root-element name="inventory-item-data"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="EdgeTagQueryRequest">
+            <xml-root-element name="edge-tag-query-request"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String"/>
+                <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String"/>
+                <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v12.StartNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v12.IncludeNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v12.SecondaryFilter"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="StartNodeFilter">
+            <xml-root-element name="start-node-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="IncludeNodeFilter">
+            <xml-root-element name="include-node-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SecondaryFilter">
+            <xml-root-element name="secondary-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SearchResults">
+            <xml-root-element name="search-results"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v12.ResultData"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ResultData">
+            <xml-root-element name="result-data"/>
+            <java-attributes>
+                <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The specific type of node in the A&amp;AI graph"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The URL to the specific resource"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SdnZoneResponse">
+            <xml-root-element name="sdn-zone-response"/>
+            <java-attributes>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v12.OamNetworks"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v12.AzAndDvsSwitches"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AzAndDvsSwitches">
+            <xml-root-element name="az-and-dvs-switches"/>
+            <java-attributes>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v12.DvsSwitches"/>
+                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v12.AvailabilityZone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Actions">
+            <xml-properties>
+                <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)."/>
+            </xml-properties>
+            <xml-root-element name="actions"/>
+            <java-attributes>
+                <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v12.Update"/>
+                <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v12.Notify"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Update">
+            <xml-properties>
+                <xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team."/>
+            </xml-properties>
+            <xml-root-element name="update"/>
+            <java-attributes>
+                <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v12.UpdateNodeKey"/>
+                <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v12.Action"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Action">
+            <xml-root-element name="action"/>
+            <java-attributes>
+                <xml-element java-attribute="actionType" name="action-type" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v12.ActionData"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ActionData">
+            <xml-root-element name="action-data"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="UpdateNodeKey">
+            <xml-root-element name="update-node-key"/>
+            <java-attributes>
+                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Notify">
+            <xml-root-element name="notify"/>
+            <java-attributes>
+                <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String"/>
+                <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v12.KeyData"/>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="KeyData">
+            <xml-root-element name="key-data"/>
+            <java-attributes>
+                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
                <java-type name="ExternalSystem">
                        <xml-properties>
@@ -566,80 +565,79 @@
 			</xml-properties>
 		</java-type>
 
-		<java-type name="CloudInfrastructure">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for cloud infrastructure." />
-			</xml-properties>
-			<xml-root-element name="cloud-infrastructure" />
-			<java-attributes>
-				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v12.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v12.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v12.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v12.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v12.VirtualDataCenters" />
-				<xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v12.OperationalEnvironments" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="CloudRegions">
-			<xml-root-element name="cloud-regions" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v12.CloudRegion" />
-			</java-attributes>
+        <java-type name="CloudInfrastructure">
             <xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+                <xml-property name="description" value="Namespace for cloud infrastructure."/>
+            </xml-properties>
+            <xml-root-element name="cloud-infrastructure"/>
+            <java-attributes>
+                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v12.Complexes"/>
+                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v12.CloudRegions"/>
+                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v12.NetworkProfiles"/>
+                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v12.Pservers"/>
+                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v12.VirtualDataCenters"/>
+                <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v12.OperationalEnvironments"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CloudRegions">
+            <xml-root-element name="cloud-regions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v12.CloudRegion"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="CloudRegion">
-			<xml-root-element name="cloud-region" />
-			<java-attributes>
-				<xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
+        <java-type name="CloudRegion">
+            <xml-root-element name="cloud-region"/>
+            <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-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the cloud (e.g., openstack)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL of the keystone identity service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." />
-					</xml-properties>
-				</xml-element>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the cloud (e.g., openstack)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation."/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." />
@@ -650,2044 +648,2077 @@
 						<xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." />
 					</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="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v12.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v12.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v12.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v12.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v12.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v12.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v12.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v12.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v12.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v12.VipIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v12.VipIpv6AddressList" />
+                <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="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v12.VolumeGroups"/>
+                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v12.Tenants"/>
+                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v12.Flavors"/>
+                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v12.GroupAssignments"/>
+                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v12.Snapshots"/>
+                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v12.Images"/>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v12.DvsSwitches"/>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v12.OamNetworks"/>
+                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v12.AvailabilityZones"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v12.VipIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v12.VipIpv6AddressList"/>
 				<xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v12.HpaCapabilities">
 					<xml-properties>
 						<xml-property name="description" value="List of cloud-region specific HPA Capabilities"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v12.EsrSystemInfoList" />
-			</java-attributes>
-			<xml-properties>
+            </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="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="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-		<java-type name="VolumeGroups">
-			<xml-properties>
-				<xml-property name="description" value="Collection of persistent block-level storage." />
-			</xml-properties>
-			<xml-root-element name="volume-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v12.VolumeGroup" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VolumeGroup">
-			<xml-root-element name="volume-group" />
-			<java-attributes>
-				<xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of volume-group." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the volume group." />
-					</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 volume-group" />
-					</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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this volume-group" />
-					</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="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-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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Persistent block-level storage." />
-				<xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" />
-				<xml-property name="searchable" value="volume-group-id,volume-group-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="volume-groups" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="RelationshipList">
-			<xml-root-element name="relationship-list" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v12.Relationship" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Relationship">
-			<xml-root-element name="relationship" />
-			<java-attributes>
-				<xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The edge label for this relationship." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to the object in A&amp;AI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v12.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v12.RelatedToProperty" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="RelatedToProperty">
-			<xml-root-element name="related-to-property" />
-			<java-attributes>
-				<xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Key part of a key/value pair" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Value part of a key/value pair" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
-
-		<java-type name="RelationshipData">
-			<xml-root-element name="relationship-data" />
-			<java-attributes>
-				<xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Value of the attribute." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Complexes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-			</xml-properties>
-			<xml-root-element name="complexes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v12.Complex" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Complex">
-			<xml-root-element name="complex" />
-			<java-attributes>
-				<xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Data center code which can be an alternate way to identify a complex" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Gamma complex name for LCP instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL of the keystone identity service" />
-					</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="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type, e.g., central office, data center." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" />
-				<xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-				<xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-				<xml-element java-attribute="state" name="state" type="java.lang.String" />
-				<xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-				<xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-				<xml-element java-attribute="region" name="region" required="true" type="java.lang.String" />
-				<xml-element java-attribute="latitude" name="latitude" type="java.lang.String" />
-				<xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
-				<xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
-				<xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-				<xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v12.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-				<xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id" />
-				<xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code" />
-				<xml-property name="uniqueProps" value="physical-location-id" />
-				<xml-property name="container" value="complexes" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="CtagPools">
-			<xml-root-element name="ctag-pools" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v12.CtagPool" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="CtagPool">
-			<xml-root-element name="ctag-pool" />
-			<java-attributes>
-				<xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="The Target provider edge router" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the availability zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Describes what the intended purpose of this pool is." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Comma separated list of ctags" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
-				<xml-property name="indexedProps" value="availability-zone-name" />
-				<xml-property name="dependentOn" value="complex" />
-				<xml-property name="container" value="ctag-pools" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Tenants">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack tenants." />
-			</xml-properties>
-			<xml-root-element name="tenants" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v12.Tenant" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Tenant">
-			<xml-root-element name="tenant" />
-			<java-attributes>
-				<xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id relative to the cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Readable name of tenant" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the tenant context." />
-					</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="vservers" name="vservers" type="inventory.aai.onap.org.v12.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack tenant" />
-				<xml-property name="nameProps" value="tenant-name" />
-				<xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context" />
-				<xml-property name="searchable" value="tenant-id,tenant-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="tenants" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Vservers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." />
-			</xml-properties>
-			<xml-root-element name="vservers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v12.Vserver" />
-			</java-attributes>
-		</java-type>
+                <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="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="VolumeGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of persistent block-level storage."/>
+            </xml-properties>
+            <xml-root-element name="volume-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v12.VolumeGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VolumeGroup">
+            <xml-root-element name="volume-group"/>
+            <java-attributes>
+                <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of volume-group."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumeGroupName" name="volume-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the volume group."/>
+                    </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 volume-group"/>
+                    </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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this volume-group"/>
+                    </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="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-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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Persistent block-level storage."/>
+                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id"/>
+                <xml-property name="searchable" value="volume-group-id,volume-group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="volume-groups"/>
+                <xml-property name="uriTemplate" value="/volume-groups/volume-group/{volume-group-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="RelationshipList">
+            <xml-root-element name="relationship-list"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v12.Relationship"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Relationship">
+            <xml-root-element name="relationship"/>
+            <java-attributes>
+                <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The edge label for this relationship."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to the object in A&amp;AI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v12.RelationshipData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v12.RelatedToProperty"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelatedToProperty">
+            <xml-root-element name="related-to-property"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Key part of a key/value pair"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Value part of a key/value pair"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Vserver">
-			<xml-root-element name="vserver" />
-			<java-attributes>
-				<xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier for this vserver relative to its tenant" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of vserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternative name of vserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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="volumes" name="volumes" type="inventory.aai.onap.org.v12.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
-				<xml-property name="nameProps" value="vserver-name" />
-				<xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" />
-				<xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2" />
-				<xml-property name="dependentOn" value="tenant" />
-				<xml-property name="container" value="vservers" />
-			</xml-properties>
-		</java-type>
+        <java-type name="RelationshipData">
+            <xml-root-element name="relationship-data"/>
+            <java-attributes>
+                <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Value of the attribute."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="LInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of logical interfaces." />
-			</xml-properties>
-			<xml-root-element name="l-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v12.LInterface" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Complexes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+            </xml-properties>
+            <xml-root-element name="complexes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v12.Complex"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="LInterface">
-			<xml-root-element name="l-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name given to the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="MAC address for the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<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 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 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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block." />
-					</xml-properties>
-				</xml-element>				
-				<xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v12.Vlans" />
-				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v12.SriovVfs" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Logical interfaces, e.g., a vnic." />
-				<xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
-				<xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
-				<xml-property name="container" value="l-interfaces" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Complex">
+            <xml-root-element name="complex"/>
+            <java-attributes>
+                <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gamma complex name for LCP instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
+                    </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="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type, e.g., central office, data center."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="street2" name="street2" type="java.lang.String"/>
+                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="state" name="state" type="java.lang.String"/>
+                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"/>
+                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"/>
+                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"/>
+                <xml-element java-attribute="lata" name="lata" type="java.lang.String"/>
+                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v12.CtagPools"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id"/>
+                <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code"/>
+                <xml-property name="uniqueProps" value="physical-location-id"/>
+                <xml-property name="container" value="complexes"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/complexes/complex/{physical-location-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CtagPools">
+            <xml-root-element name="ctag-pools"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v12.CtagPool"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CtagPool">
+            <xml-root-element name="ctag-pool"/>
+            <java-attributes>
+                <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="The Target provider edge router"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the availability zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes what the intended purpose of this pool is."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Comma separated list of ctags"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose."/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="ctag-pools"/>
+                <xml-property name="uriTemplate" value="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="SriovVfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of SR-IOV Virtual Functions." />
-			</xml-properties>
-			<xml-root-element name="sriov-vfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v12.SriovVf" />
-			</java-attributes>
-		</java-type>
-		<java-type name="SriovVf">
-			<xml-root-element name="sriov-vf" />
-			<java-attributes>
-				<xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="PCI ID used to identify the sriov-vf" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto." />
-					</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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
-				<xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" />
-				<xml-property name="dependentOn" value="l-interface" />
-				<xml-property name="container" value="sriov-vfs" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Tenants">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack tenants."/>
+            </xml-properties>
+            <xml-root-element name="tenants"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v12.Tenant"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="L3InterfaceIpv4AddressList">
-			<xml-root-element name="l3-interface-ipv4-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 32 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv4 Address Range" />
-				<xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Tenant">
+            <xml-root-element name="tenant"/>
+            <java-attributes>
+                <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id relative to the cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Readable name of tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the tenant context."/>
+                    </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="vservers" name="vservers" type="inventory.aai.onap.org.v12.Vservers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack tenant"/>
+                <xml-property name="nameProps" value="tenant-name"/>
+                <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context"/>
+                <xml-property name="searchable" value="tenant-id,tenant-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="tenants"/>
+                <xml-property name="uriTemplate" value="/tenants/tenant/{tenant-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vlans">
-			<xml-root-element name="vlans" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v12.Vlan" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Vservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs."/>
+            </xml-properties>
+            <xml-root-element name="vservers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v12.Vserver"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vserver">
+            <xml-root-element name="vserver"/>
+            <java-attributes>
+                <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternative name of vserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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). 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" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="volumes" name="volumes" type="inventory.aai.onap.org.v12.Volumes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
+                <xml-property name="nameProps" value="vserver-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2"/>
+                <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="container" value="vservers"/>
+                <xml-property name="uriTemplate" value="/vservers/vserver/{vserver-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vlan">
-			<xml-root-element name="vlan" />
-			<java-attributes>
-				<xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="String that identifies the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</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="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to describe (the service associated with) the vlan" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
-					<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 java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
-					</xml-properties>
-				</xml-element>			
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key" />
-				<xml-property name="dependentOn" value="l-interface" />
-				<xml-property name="container" value="vlans" />
-			</xml-properties>
-		</java-type>
+        <java-type name="LInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="l-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v12.LInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LInterface">
+            <xml-root-element name="l-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name given to the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="MAC address for the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <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 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 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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v12.Vlans"/>
+                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v12.SriovVfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
+                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name"/>
+                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface"/>
+                <xml-property name="container" value="l-interfaces"/>
+                <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="L3InterfaceIpv6AddressList">
-			<xml-root-element name="l3-interface-ipv6-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 128 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv6 Address Range" />
-				<xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
-			</xml-properties>
-		</java-type>
+        <java-type name="SriovVfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Virtual Functions."/>
+            </xml-properties>
+            <xml-root-element name="sriov-vfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v12.SriovVf"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovVf">
+            <xml-root-element name="sriov-vf"/>
+            <java-attributes>
+                <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="PCI ID used to identify the sriov-vf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
+                    </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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
+                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="sriov-vfs"/>
+                <xml-property name="uriTemplate" value="/sriov-vfs/sriov-vf/{pci-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Volumes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of ephemeral Block storage volumes." />
-			</xml-properties>
-			<xml-root-element name="volumes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v12.Volume" />
-			</java-attributes>
-		</java-type>
+        <java-type name="L3InterfaceIpv4AddressList">
+            <xml-root-element name="l3-interface-ipv4-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc"/>
+            <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vlans">
+            <xml-root-element name="vlans"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v12.Vlan"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vlan">
+            <xml-root-element name="vlan"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="String that identifies the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </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="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to describe (the service associated with) the vlan"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
+                    <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 java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of vlan"/>
+                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="vlans"/>
+                <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Volume">
-			<xml-root-element name="volume" />
-			<java-attributes>
-				<xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of block storage volume relative to the vserver." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Ephemeral Block storage volume." />
-				<xml-property name="indexedProps" value="volume-id" />
-				<xml-property name="dependentOn" value="vserver" />
-				<xml-property name="container" value="volumes" />
-			</xml-properties>
-		</java-type>
+        <java-type name="L3InterfaceIpv6AddressList">
+            <xml-root-element name="l3-interface-ipv6-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc"/>
+            <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Flavors">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack flavors." />
-			</xml-properties>
-			<xml-root-element name="flavors" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v12.Flavor" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Volumes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of ephemeral Block storage volumes."/>
+            </xml-properties>
+            <xml-root-element name="volumes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v12.Volume"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Volume">
+            <xml-root-element name="volume"/>
+            <java-attributes>
+                <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Ephemeral Block storage volume."/>
+                <xml-property name="indexedProps" value="volume-id"/>
+                <xml-property name="dependentOn" value="vserver"/>
+                <xml-property name="container" value="volumes"/>
+                <xml-property name="uriTemplate" value="/volumes/volume/{volume-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Flavor">
-			<xml-root-element name="flavor" />
-			<java-attributes>
-				<xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Flavor id, expected to be unique across cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Cloud region Flavor name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Number of CPUs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Amount of memory" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Disk space" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Amount of ephemeral disk space" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="amount of swap space allocation" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" />
-					</xml-properties>
-				</xml-element>
+        <java-type name="Flavors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack flavors."/>
+            </xml-properties>
+            <xml-root-element name="flavors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v12.Flavor"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Flavor">
+            <xml-root-element name="flavor"/>
+            <java-attributes>
+                <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Flavor name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of CPUs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Amount of memory"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Disk space"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Amount of ephemeral disk space"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="amount of swap space allocation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled"/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v12.HpaCapabilities">
 					<xml-properties>
 						<xml-property name="description" value="List of flavor specific HPA Capabilities"/>
 					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack flavor." />
-				<xml-property name="nameProps" value="flavor-name" />
-				<xml-property name="indexedProps" value="flavor-name,flavor-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<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-properties>
-			<xml-root-element name="snapshots" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v12.Snapshot" />
-			</java-attributes>		
-		</java-type>
-		
-		<java-type name="Snapshot">
-			<xml-root-element name="snapshot" />
-			<java-attributes>
-				<xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Snapshot name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operating system architecture" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The common name of the operating system distribution in lowercase" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The operating system version as specified by the distributor." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack snapshot" />
-				<xml-property name="nameProps" value="snapshot-name" />
-				<xml-property name="uniqueProps" value="snapshot-id" />
-				<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>	
-		</java-type>
-		
-		<java-type name="GroupAssignments">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack group assignments" />
-			</xml-properties>
-			<xml-root-element name="group-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v12.GroupAssignment" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="GroupAssignment">
-			<xml-root-element name="group-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Group id, expected to be unique across cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group type - the type of group this instance refers to" />
-					</xml-properties>
-				</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-element>
-				<xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group description - description of the group" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
-				<xml-property name="nameProps" value="group-name" />
-				<xml-property name="indexedProps" value="group-id,group-type,group-name" />
-				<xml-property name="searchable" value="group-id,group-name"/>
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="group-assignments" />
-			</xml-properties>
-		</java-type>			
-
-		<java-type name="Images">
-			<xml-properties>
-				<xml-property name="description" value="Collectio of Openstack images." />
-			</xml-properties>
-			<xml-root-element name="images" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v12.Image" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Image">
-			<xml-root-element name="image" />
-			<java-attributes>
-				<xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Image id, expected to be unique across cloud region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Image name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operating system architecture." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The common name of the operating system distribution in lowercase" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The operating system version as specified by the distributor." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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.v12.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack image." />
-				<xml-property name="nameProps" value="image-name" />
-				<xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="images" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Metadata">
-			<xml-properties>
-				<xml-property name="description" value="Collection of metadatum (key/value pairs)" />
-			</xml-properties>
-			<xml-root-element name="metadata" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v12.Metadatum" />
-			</java-attributes>
-		</java-type>
+                <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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack flavor."/>
+                <xml-property name="nameProps" value="flavor-name"/>
+                <xml-property name="indexedProps" value="flavor-name,flavor-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="flavors"/>
+                <xml-property name="uriTemplate" value="/flavors/flavor/{flavor-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Metadatum">
-			<xml-root-element name="metadatum" />
-			<java-attributes>
-				<xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="metaval" name="metaval" required="true" 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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Key/value pairs" />
-				<xml-property name="indexedProps" value="metaname" />
-				<xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" />
-				<xml-property name="container" value="metadata" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Snapshots">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack snapshots"/>
+            </xml-properties>
+            <xml-root-element name="snapshots"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v12.Snapshot"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Snapshot">
+            <xml-root-element name="snapshot"/>
+            <java-attributes>
+                <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Snapshot name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system architecture"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack snapshot"/>
+                <xml-property name="nameProps" value="snapshot-name"/>
+                <xml-property name="uniqueProps" value="snapshot-id"/>
+                <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-property name="uriTemplate" value="/snapshots/snapshot/{snapshot-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="DvsSwitches">
-			<xml-properties>
-				<xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." />
-			</xml-properties>
-			<xml-root-element name="dvs-switches" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v12.DvsSwitch" />
-			</java-attributes>
-		</java-type>
+        <java-type name="GroupAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack group assignments"/>
+            </xml-properties>
+            <xml-root-element name="group-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v12.GroupAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="GroupAssignment">
+            <xml-root-element name="group-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Group id, expected to be unique across cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group type - the type of group this instance refers to"/>
+                    </xml-properties>
+                </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-element>
+                <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group description - description of the group"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)."/>
+                <xml-property name="nameProps" value="group-name"/>
+                <xml-property name="indexedProps" value="group-id,group-type,group-name"/>
+                <xml-property name="searchable" value="group-id,group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="group-assignments"/>
+                <xml-property name="uriTemplate" value="/group-assignments/group-assignment/{group-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="DvsSwitch">
-			<xml-root-element name="dvs-switch" />
-			<java-attributes>
-				<xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="DVS switch name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL used to reach the vcenter" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
-				<xml-property name="indexedProps" value="vcenter-url,switch-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="dvs-switches" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Images">
+            <xml-properties>
+                <xml-property name="description" value="Collectio of Openstack images."/>
+            </xml-properties>
+            <xml-root-element name="images"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v12.Image"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Image">
+            <xml-root-element name="image"/>
+            <java-attributes>
+                <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Image id, expected to be unique across cloud region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Image name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system architecture."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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.v12.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack image."/>
+                <xml-property name="nameProps" value="image-name"/>
+                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="images"/>
+                <xml-property name="uriTemplate" value="/images/image/{image-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="NetworkProfiles">
-			<xml-properties>
-				<xml-property name="description" value="Collection of network profiles" />
-			</xml-properties>
-			<xml-root-element name="network-profiles" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v12.NetworkProfile" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Metadata">
+            <xml-properties>
+                <xml-property name="description" value="Collection of metadatum (key/value pairs)"/>
+            </xml-properties>
+            <xml-root-element name="metadata"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v12.Metadatum"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Metadatum">
+            <xml-root-element name="metadatum"/>
+            <java-attributes>
+                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="metaval" name="metaval" required="true" 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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Key/value pairs"/>
+                <xml-property name="indexedProps" value="metaname"/>
+                <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model"/>
+                <xml-property name="container" value="metadata"/>
+                <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="NetworkProfile">
-			<xml-root-element name="network-profile" />
-			<java-attributes>
-				<xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique name of network profile." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encrypted SNMP community string" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
-				<xml-property name="indexedProps" value="nm-profile-name" />
-				<xml-property name="container" value="network-profiles" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="DvsSwitches">
+            <xml-properties>
+                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs."/>
+            </xml-properties>
+            <xml-root-element name="dvs-switches"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v12.DvsSwitch"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="DvsSwitch">
+            <xml-root-element name="dvs-switch"/>
+            <java-attributes>
+                <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS switch name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL used to reach the vcenter"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
+                <xml-property name="indexedProps" value="vcenter-url,switch-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="dvs-switches"/>
+                <xml-property name="uriTemplate" value="/dvs-switches/dvs-switch/{switch-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Pservers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of compute hosts." />
-			</xml-properties>
-			<xml-root-element name="pservers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v12.Pserver" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="NetworkProfiles">
+            <xml-properties>
+                <xml-property name="description" value="Collection of network profiles"/>
+            </xml-properties>
+            <xml-root-element name="network-profiles"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v12.NetworkProfile"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NetworkProfile">
+            <xml-root-element name="network-profile"/>
+            <java-attributes>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique name of network profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted SNMP community string"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Network profile populated by SDN-GP for SNMP"/>
+                <xml-property name="indexedProps" value="nm-profile-name"/>
+                <xml-property name="container" value="network-profiles"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Pserver">
-			<xml-root-element name="pserver" />
-			<java-attributes>
-				<xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Value from executing hostname on the compute node." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="PTNII name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Number of cpus" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Disk size, in GBs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="RAM size, in MBs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Fully-qualified domain name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Serial number, may be queried" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 OAM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of Pserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="internet topology of Pserver" />
-					</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 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="pserverName2" name="pserver-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="alternative pserver name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="purpose of pserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates who owns and or manages the device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The host profile that defines the configuration of the pserver." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v12.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v12.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
-				<xml-property name="nameProps" value="pserver-name2" />
-				<xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status" />
-				<xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" />
-				<xml-property name="container" value="pservers" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Pservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of compute hosts."/>
+            </xml-properties>
+            <xml-root-element name="pservers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v12.Pserver"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="PInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical interfaces." />
-			</xml-properties>
-			<xml-root-element name="p-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v12.PInterface" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Pserver">
+            <xml-root-element name="pserver"/>
+            <java-attributes>
+                <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value from executing hostname on the compute node."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="PTNII name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of cpus"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Disk size, in GBs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="RAM size, in MBs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Fully-qualified domain name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number, may be queried"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of Pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="internet topology of Pserver"/>
+                    </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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </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="pserverName2" name="pserver-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="alternative pserver name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="purpose of pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates who owns and or manages the device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The host profile that defines the configuration of the pserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v12.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v12.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
+                <xml-property name="nameProps" value="pserver-name2"/>
+                <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status"/>
+                <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address"/>
+                <xml-property name="uniqueProps" value="hostname"/>
+                <xml-property name="container" value="pservers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/pservers/pserver/{hostname}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="PInterface">
-			<xml-root-element name="p-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name that identifies the physical interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Nature of the services and connectivity on this port." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CLEI or other specification for p-interface hardware." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role specification for p-interface hardware." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the physical properties of the interface." />
-					</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>
+        <java-type name="PInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="p-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v12.PInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PInterface">
+            <xml-root-element name="p-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the physical interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nature of the services and connectivity on this port."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role specification for p-interface hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
+                    </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="macAddress" name="mac-addresss" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="MAC Address of the p-interface." />
 					</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="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="inventory status" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v12.SriovPfs" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Physical interface (e.g., nic)" />
-				<xml-property name="indexedProps" value="interface-name,prov-status" />
-				<xml-property name="nameProps" value="prov-status" />
-				<xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
-				<xml-property name="container" value="p-interfaces" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="LagInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of link aggregate interfaces." />
-			</xml-properties>
-			<xml-root-element name="lag-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v12.LagInterface" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="LagInterface">
-			<xml-root-element name="lag-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name that identifies the link aggregate interface" />
-					</xml-properties>
-				</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 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="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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 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.v12.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Link aggregate interface" />
-				<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>
-
-		<java-type name="OamNetworks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. " />
-			</xml-properties>
-			<xml-root-element name="oam-networks" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v12.OamNetwork" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="OamNetwork">
-			<xml-root-element name="oam-network" />
-			<java-attributes>
-				<xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of the network. Unique across a cloud-region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="cvlan-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
-				<xml-property name="nameProps" value="network-name" />
-				<xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="oam-networks" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="AvailabilityZones">
-			<xml-properties>
-				<xml-property name="description" value="Collection of availability zones" />
-			</xml-properties>
-			<xml-root-element name="availability-zones" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v12.AvailabilityZone" />
-			</java-attributes>
-		</java-type>
+                <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="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="inventory status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v12.SriovPfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Physical interface (e.g., nic)"/>
+                <xml-property name="indexedProps" value="interface-name,prov-status"/>
+                <xml-property name="nameProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
+                <xml-property name="container" value="p-interfaces"/>
+                <xml-property name="uriTemplate" value="/p-interfaces/p-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="AvailabilityZone">
-			<xml-root-element name="availability-zone" />
-			<java-attributes>
-				<xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the availability zone.  Unique across a cloud region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
-				<xml-property name="indexedProps" value="availability-zone-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="availability-zones" />
-			</xml-properties>
-		</java-type>
+        <java-type name="LagInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregate interfaces."/>
+            </xml-properties>
+            <xml-root-element name="lag-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v12.LagInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LagInterface">
+            <xml-root-element name="lag-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the link aggregate interface"/>
+                    </xml-properties>
+                </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 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="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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 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.v12.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Link aggregate interface"/>
+                <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-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VirtualDataCenters">
-			<xml-properties>
-				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-			</xml-properties>
-			<xml-root-element name="virtual-data-centers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v12.VirtualDataCenter" />
-			</java-attributes>
-		</java-type>
+        <java-type name="OamNetworks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. "/>
+            </xml-properties>
+            <xml-root-element name="oam-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v12.OamNetwork"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OamNetwork">
+            <xml-root-element name="oam-network"/>
+            <java-attributes>
+                <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="cvlan-id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="oam-networks"/>
+                <xml-property name="uriTemplate" value="/oam-networks/oam-network/{network-uuid}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VirtualDataCenter">
-			<xml-root-element name="virtual-data-center" />
-			<java-attributes>
-				<xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of the vdc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the virtual data center" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-				<xml-property name="nameProps" value="vdc-name" />
-				<xml-property name="indexedProps" value="vdc-name,vdc-id" />
-				<xml-property name="container" value="virtual-data-centers" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="AvailabilityZones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of availability zones"/>
+            </xml-properties>
+            <xml-root-element name="availability-zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v12.AvailabilityZone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AvailabilityZone">
+            <xml-root-element name="availability-zone"/>
+            <java-attributes>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers"/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="availability-zones"/>
+                <xml-property name="uriTemplate" value="/availability-zones/availability-zone/{availability-zone-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Business">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for business related constructs" />
-			</xml-properties>
-			<xml-root-element name="business" />
-			<java-attributes>
-				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v12.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v12.Customers" />
-				<xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v12.LinesOfBusiness" />
-				<xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v12.OwningEntities" />
-				<xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v12.Platforms" />
-				<xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v12.Projects" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VirtualDataCenters">
+            <xml-properties>
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+            </xml-properties>
+            <xml-root-element name="virtual-data-centers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v12.VirtualDataCenter"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VirtualDataCenter">
+            <xml-root-element name="virtual-data-center"/>
+            <java-attributes>
+                <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the vdc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the virtual data center"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+                <xml-property name="nameProps" value="vdc-name"/>
+                <xml-property name="indexedProps" value="vdc-name,vdc-id"/>
+                <xml-property name="container" value="virtual-data-centers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Projects">
-			<xml-properties>
-				<xml-property name="description" value="Collection of projects" />
-			</xml-properties>
-			<xml-root-element name="projects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v12.Project" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Business">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for business related constructs"/>
+            </xml-properties>
+            <xml-root-element name="business"/>
+            <java-attributes>
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v12.Connectors"/>
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v12.Customers"/>
+                <xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v12.LinesOfBusiness"/>
+                <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v12.OwningEntities"/>
+                <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v12.Platforms"/>
+                <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v12.Projects"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Projects">
+            <xml-properties>
+                <xml-property name="description" value="Collection of projects"/>
+            </xml-properties>
+            <xml-root-element name="projects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v12.Project"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Project">
+            <xml-root-element name="project"/>
+            <java-attributes>
+                <xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the project deploying a service"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes the project"/>
+                <xml-property name="indexedProps" value="project-name"/>
+                <xml-property name="uniqueProps" value="project-name"/>
+                <xml-property name="container" value="projects"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/projects/project/{project-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Project">
-			<xml-root-element name="project" />
-			<java-attributes>
-				<xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the project deploying a service" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes the project" />
-				<xml-property name="indexedProps" value="project-name" />
-				<xml-property name="uniqueProps" value="project-name" />
-				<xml-property name="container" value="projects" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Connectors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
+            </xml-properties>
+            <xml-root-element name="connectors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v12.Connector"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Connector">
+            <xml-root-element name="connector"/>
+            <java-attributes>
+                <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of resource instance."/>
+                    </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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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">
+                    <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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata"/>
+            </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,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-property name="uriTemplate" value="/business/connectors/connector/{resource-instance-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Connectors">
-			<xml-properties>
-				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
-			</xml-properties>
-			<xml-root-element name="connectors" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v12.Connector" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Customers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
+            </xml-properties>
+            <xml-root-element name="customers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v12.Customer"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Connector">
-			<xml-root-element name="connector" />
-			<java-attributes>
-				<xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of resource instance." />
-					</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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata" />
-			</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,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>
-		</java-type>
+        <java-type name="Customer">
+            <xml-root-element name="customer"/>
+            <java-attributes>
+                <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers."/>
+                        <xml-property name="defaultValue" value="CUST"/>
+                    </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="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v12.ServiceSubscriptions"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
+                <xml-property name="nameProps" value="subscriber-name"/>
+                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type"/>
+                <xml-property name="searchable" value="global-customer-id,subscriber-name"/>
+                <xml-property name="uniqueProps" value="global-customer-id"/>
+                <xml-property name="container" value="customers"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/customers/customer/{global-customer-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Customers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." />
-			</xml-properties>
-			<xml-root-element name="customers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v12.Customer" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="LinesOfBusiness">
+            <xml-properties>
+                <xml-property name="description" value="Collection of lines-of-business"/>
+            </xml-properties>
+            <xml-root-element name="lines-of-business"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v12.LineOfBusiness"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LineOfBusiness">
+            <xml-root-element name="line-of-business"/>
+            <java-attributes>
+                <xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the line-of-business (product)"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a line-of-business"/>
+                <xml-property name="indexedProps" value="line-of-business-name"/>
+                <xml-property name="uniqueProps" value="line-of-business-name"/>
+                <xml-property name="container" value="lines-of-business"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/lines-of-business/line-of-business/{line-of-business-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Customer">
-			<xml-root-element name="customer" />
-			<java-attributes>
-				<xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." />
-						<xml-property name="defaultValue" value="CUST" />
-					</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="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v12.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
-				<xml-property name="nameProps" value="subscriber-name" />
-				<xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
-				<xml-property name="searchable" value="global-customer-id,subscriber-name" />
-				<xml-property name="uniqueProps" value="global-customer-id" />
-				<xml-property name="container" value="customers" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="LinesOfBusiness">
-			<xml-properties>
-				<xml-property name="description" value="Collection of lines-of-business" />
-			</xml-properties>
-			<xml-root-element name="lines-of-business" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v12.LineOfBusiness" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="LineOfBusiness">
-			<xml-root-element name="line-of-business" />
-			<java-attributes>
-				<xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the line-of-business (product)" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes a line-of-business" />
-				<xml-property name="indexedProps" value="line-of-business-name" />
-				<xml-property name="uniqueProps" value="line-of-business-name" />
-				<xml-property name="container" value="lines-of-business" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="OwningEntities">
-			<xml-properties>
-				<xml-property name="description" value="Collection of owning-entities" />
-			</xml-properties>
-			<xml-root-element name="owning-entities" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v12.OwningEntity" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="OwningEntity">
-			<xml-root-element name="owning-entity" />
-			<java-attributes>
-				<xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of an owning entity" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Owning entity name" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes an owning-entity" />
-				<xml-property name="indexedProps" value="owning-entity-id, owning-entity-name" />
-				<xml-property name="searchable" value="owning-entity-id" />
-				<xml-property name="uniqueProps" value="owning-entity-id, owning-entity-name" />
-				<xml-property name="container" value="owning-entities" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="Platforms">
-			<xml-properties>
-				<xml-property name="description" value="Collection of platforms" />
-			</xml-properties>
-			<xml-root-element name="platforms" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v12.Platform" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="Platform">
-			<xml-root-element name="platform" />
-			<java-attributes>
-				<xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the platform" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes a platform" />
-				<xml-property name="indexedProps" value="platform-name" />
-				<xml-property name="uniqueProps" value="platform-name" />
-				<xml-property name="container" value="platforms" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="ServiceSubscriptions">
-			<xml-properties>
-				<xml-property name="description" value="Collection of objects that group service instances." />
-			</xml-properties>
-			<xml-root-element name="service-subscriptions" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v12.ServiceSubscription" />
-			</java-attributes>
-		</java-type>
+        <java-type name="OwningEntities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of owning-entities"/>
+            </xml-properties>
+            <xml-root-element name="owning-entities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v12.OwningEntity"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OwningEntity">
+            <xml-root-element name="owning-entity"/>
+            <java-attributes>
+                <xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an owning entity"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Owning entity name"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an owning-entity"/>
+                <xml-property name="indexedProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="searchable" value="owning-entity-id"/>
+                <xml-property name="uniqueProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="container" value="owning-entities"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/owning-entities/owning-entity/{owning-entity-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceSubscription">
-			<xml-root-element name="service-subscription" />
-			<java-attributes>
-				<xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+        <java-type name="Platforms">
+            <xml-properties>
+                <xml-property name="description" value="Collection of platforms"/>
+            </xml-properties>
+            <xml-root-element name="platforms"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v12.Platform"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Platform">
+            <xml-root-element name="platform"/>
+            <java-attributes>
+                <xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution." />
+                        <xml-property name="description" value="Name of the platform"/>
                     </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="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v12.ServiceInstances">
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Object that group service instances." />
-				<xml-property name="indexedProps" value="service-type" />
-				<xml-property name="dependentOn" value="customer" />
-				<xml-property name="container" value="service-subscriptions" />
-				<xml-property name="crossEntityReference" value="service-instance,service-type" />
-			</xml-properties>
-		</java-type>
+                <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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a platform"/>
+                <xml-property name="indexedProps" value="platform-name"/>
+                <xml-property name="uniqueProps" value="platform-name"/>
+                <xml-property name="container" value="platforms"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/platforms/platform/{platform-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceInstances">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service instances" />
-			</xml-properties>
-			<xml-root-element name="service-instances" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v12.ServiceInstance" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ServiceSubscriptions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of objects that group service instances."/>
+            </xml-properties>
+            <xml-root-element name="service-subscriptions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v12.ServiceSubscription"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceSubscription">
+            <xml-root-element name="service-subscription"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
+                    </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="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v12.ServiceInstances">
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Object that group service instances."/>
+                <xml-property name="indexedProps" value="service-type"/>
+                <xml-property name="dependentOn" value="customer"/>
+                <xml-property name="container" value="service-subscriptions"/>
+                <xml-property name="crossEntityReference" value="service-instance,service-type"/>
+                <xml-property name="uriTemplate" value="/service-subscriptions/service-subscription/{service-type}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceInstance">
-			<xml-root-element name="service-instance" />
-			<java-attributes>
-				<xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this instance of a service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
-					<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="serviceType" name="service-type" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="String capturing type of service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="String capturing the service role." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the environment context assigned to the service-instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the workload context assigned to the service-instance." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="ServiceInstances">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service instances"/>
+            </xml-properties>
+            <xml-root-element name="service-instances"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v12.ServiceInstance"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceInstance">
+            <xml-root-element name="service-instance"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this instance of a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
+                    <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="serviceType" name="service-type" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing the service role."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the environment context assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the workload context assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="createdAt" name="created-at" required="false" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="create time of Network Service." />
@@ -2705,1601 +2736,1635 @@
                 </xml-element>
                 <!-- for storing the nsd_id create edge between services -->
                 <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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL customers will use to access the vHN Portal." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
-					</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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata" />
-				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v12.AllottedResources" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Instance of a service" />
-				<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,environment-context,workload-context" />
-				<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" />
-				<xml-property name="dependentOn" value="service-subscription" />
-				<xml-property name="container" value="service-instances" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="ServiceDesignAndCreation">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for objects managed by ASDC" />
-			</xml-properties>
-			<xml-root-element name="service-design-and-creation" />
-			<java-attributes>
-				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v12.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v12.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v12.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v12.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v12.NamedQueries" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VnfImages">
-			<xml-properties>
-				<xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
-			</xml-properties>
-			<xml-root-element name="vnf-images" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v12.VnfImage" />
-			</java-attributes>
-		</java-type>
-
-		<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-properties>
-						<xml-property name="description" value="Unique ID of this asset" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
-				<xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" />
-				<xml-property name="uniqueProps" value="vnf-image-uuid" />
-				<xml-property name="container" value="vnf-images" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Services">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC." />
-			</xml-properties>
-			<xml-root-element name="services" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v12.Service" />
-			</java-attributes>
-		</java-type>
+                    <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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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">
+                    <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="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL customers will use to access the vHN Portal."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used."/>
+                    </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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata"/>
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v12.AllottedResources"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a service"/>
+                <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,environment-context,workload-context"/>
+                <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"/>
+                <xml-property name="dependentOn" value="service-subscription"/>
+                <xml-property name="container" value="service-instances"/>
+                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Service">
-			<xml-root-element name="service" />
-			<java-attributes>
-				<xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description of the service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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="serviceVersion" name="service-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="service version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
-				<xml-property name="indexedProps" value="service-description,service-id" />
-				<xml-property name="container" value="services" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
+        <java-type name="ServiceDesignAndCreation">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for objects managed by ASDC"/>
+            </xml-properties>
+            <xml-root-element name="service-design-and-creation"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v12.VnfImages"/>
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v12.Services"/>
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v12.ServiceCapabilities"/>
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v12.Models"/>
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v12.NamedQueries"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VnfImages">
+            <xml-properties>
+                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+            </xml-properties>
+            <xml-root-element name="vnf-images"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v12.VnfImage"/>
+            </java-attributes>
+        </java-type>
+
+        <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-properties>
+                        <xml-property name="description" value="Unique ID of this asset"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version"/>
+                <xml-property name="uniqueProps" value="vnf-image-uuid"/>
+                <xml-property name="container" value="vnf-images"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceCapabilities">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service capabilities." />
-			</xml-properties>
-			<xml-root-element name="service-capabilities" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v12.ServiceCapability" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Services">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
+            </xml-properties>
+            <xml-root-element name="services"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v12.Service"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Service">
+            <xml-root-element name="service"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of the service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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="serviceVersion" name="service-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="service version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services."/>
+                <xml-property name="indexedProps" value="service-description,service-id"/>
+                <xml-property name="container" value="services"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/services/service/{service-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceCapability">
-			<xml-root-element name="service-capability" />
-			<java-attributes>
-				<xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="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="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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
-				<xml-property name="indexedProps" value="service-type,vnf-type" />
-				<xml-property name="container" value="service-capabilities" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
+        <java-type name="ServiceCapabilities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service capabilities."/>
+            </xml-properties>
+            <xml-root-element name="service-capabilities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v12.ServiceCapability"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceCapability">
+            <xml-root-element name="service-capability"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="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="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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
+                <xml-property name="indexedProps" value="service-type,vnf-type"/>
+                <xml-property name="container" value="service-capabilities"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Network">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for network inventory resources." />
-			</xml-properties>
-			<xml-root-element name="network" />
-			<java-attributes>
-				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v12.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v12.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v12.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v12.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v12.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v12.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v12.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v12.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v12.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v12.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v12.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v12.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v12.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v12.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v12.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v12.RouteTableReferences" />
-				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v12.InstanceGroups" />
-				<xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v12.Zones" />
-				<xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v12.Configurations" />
-				<xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v12.ForwardingPaths" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Network">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for network inventory resources."/>
+            </xml-properties>
+            <xml-root-element name="network"/>
+            <java-attributes>
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v12.LogicalLinks"/>
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v12.SitePairSets"/>
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v12.VpnBindings"/>
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v12.VplsPes"/>
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v12.MulticastConfigurations"/>
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v12.Vces"/>
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v12.Vnfcs"/>
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v12.L3Networks"/>
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v12.NetworkPolicies"/>
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v12.GenericVnfs"/>
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v12.LagLinks"/>
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v12.Newvces"/>
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v12.Pnfs"/>
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v12.PhysicalLinks"/>
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v12.IpsecConfigurations"/>
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v12.RouteTableReferences"/>
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v12.InstanceGroups"/>
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v12.Zones"/>
+                <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v12.Configurations"/>
+                <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v12.ForwardingPaths"/>
+            </java-attributes>
+        </java-type>
         <java-type name="Configurations">
-			<xml-properties>
-				<xml-property name="description" value="Collection of configurations" />
-			</xml-properties>
-			<xml-root-element name="configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v12.Configuration" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Configuration">
-			<xml-root-element name="configuration" />
-			<java-attributes>
-				<xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID assigned to configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="port-mirroring-configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationSubType" name="configuration-sub-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="vprobe, pprobe." />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of the configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id of  the configuration used to customize the resource" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="DHV Site Effective Bandwidth" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Velocloud Nominal Throughput - VNT" />
-					</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.v12.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata" />
-				<xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v12.ForwarderEvcs" />
-				<xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v12.Evcs" />
-			</java-attributes>
-			<xml-properties>
-                <xml-property name="description" value="Port Mirror Configuration." />
-				<xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" />
-				<xml-property name="uniqueProps" value="configuration-id" />
-				<xml-property name="container" value="configurations" />
-				<xml-property name="namespace" value="network" />
-                <xml-property name="nameProps" value="configuration-type" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="LogicalLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of logical connections" />
-			</xml-properties>
-			<xml-root-element name="logical-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v12.LogicalLink" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="LogicalLink">
-			<xml-root-element name="logical-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element 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 java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of logical link, e.g., evc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="v4, v6, or ds for dual stack" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="For example, static or BGP" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indication of operational status of the logical link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indication of the network use of the logical link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
-					</xml-properties>
-				</xml-element>
-					<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Reason for this entity, role it is playing" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
-				<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-property name="searchable" value="link-name" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="SitePairSets">
-			<xml-properties>
-				<xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" />
-			</xml-properties>
-			<xml-root-element name="site-pair-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v12.SitePairSet" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SitePairSet">
-			<xml-root-element name="site-pair-set" />
-			<java-attributes>
-				<xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of site pair set." />
-					</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="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v12.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
-				<xml-property name="indexedProps" value="site-pair-set-id" />
-				<xml-property name="uniqueProps" value="site-pair-set-id" />
-				<xml-property name="container" value="site-pair-sets" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="RoutingInstances">
-			<xml-properties>
-				<xml-property name="description" value="set of probes related to generic-vnf routing instance" />
-			</xml-properties>
-			<xml-root-element name="routing-instances" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v12.RoutingInstance" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="RoutingInstance">
-			<xml-root-element name="routing-instance" />
-			<java-attributes>
-				<xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of routing instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="rpm owner" />
-					</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="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v12.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="routing-instance-id" />
-				<xml-property name="dependentOn" value="site-pair-set" />
-				<xml-property name="container" value="routing-instances" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="SitePairs">
-			<xml-properties>
-				<xml-property name="description" value="probe within a set" />
-			</xml-properties>
-			<xml-root-element name="site-pairs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v12.SitePair" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SitePair">
-			<xml-root-element name="site-pair" />
-			<java-attributes>
-				<xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prefix address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prefix address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip version, v4, v6" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." />
-					</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="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v12.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="site-pair-id" />
-				<xml-property name="uniqueProps" value="site-pair-id" />
-				<xml-property name="dependentOn" value="routing-instance" />
-				<xml-property name="container" value="site-pairs" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="ClassesOfService">
-			<xml-properties>
-				<xml-property name="description" value="class-of-service of probe" />
-			</xml-properties>
-			<xml-root-element name="classes-of-service" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v12.ClassOfService" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="ClassOfService">
-			<xml-root-element name="class-of-service" />
-			<java-attributes>
-				<xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="type of probe" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="cos" />
-				<xml-property name="dependentOn" value="site-pair" />
-				<xml-property name="container" value="classes-of-service" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VpnBindings">
-			<xml-root-element name="vpn-bindings" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v12.VpnBinding" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VpnBinding">
-			<xml-root-element name="vpn-binding" />
-			<java-attributes>
-				<xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="VPN ID, globally unique within A&amp;AI" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="VPN Name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="region of customer vpn" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id for this customer vpn" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
-					</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="routeTargets" name="route-targets" type="inventory.aai.onap.org.v12.RouteTargets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList">
-					<xml-properties>
-						<xml-property name="description" value="l3-networks relate to vpn-bindings" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="VPN binding" />
-				<xml-property name="nameProps" value="vpn-name,vpn-type" />
-				<xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type" />
-				<xml-property name="searchable" value="vpn-id,vpn-name" />
-				<xml-property name="uniqueProps" value="vpn-id" />
-				<xml-property name="container" value="vpn-bindings" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VplsPes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of VPLS Provider Edge routers" />
-			</xml-properties>
-			<xml-root-element name="vpls-pes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v12.VplsPe" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VplsPe">
-			<xml-root-element name="vpls-pe" />
-			<java-attributes>
-				<xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Temporary location for stag to get to VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v12.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v12.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v12.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="VPLS Provider Edge routers." />
-				<xml-property name="indexedProps" value="prov-status,equipment-name" />
-				<xml-property name="container" value="vpls-pes" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="MulticastConfigurations">
-			<xml-properties>
-				<xml-property name="description" value="multicast configuration of generic-vnf ip-address" />
-			</xml-properties>
-			<xml-root-element name="multicast-configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v12.MulticastConfiguration" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="MulticastConfiguration">
-			<xml-root-element name="multicast-configuration" />
-			<java-attributes>
-				<xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of multicast configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="protocol of multicast configuration" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="rp type of multicast configuration" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="multicast-configuration-id" />
-				<xml-property name="uniqueProps" value="multicast-configuration-id" />
-				<xml-property name="container" value="multicast-configurations" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Vces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated." />
-			</xml-properties>
-			<xml-root-element name="vces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v12.Vce" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vce">
-			<xml-root-element name="vce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternate name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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 strictly map to ASDC services, 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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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="Network role being played by this VNF" />
-					</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, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of VPE connected to this VCE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Loopback0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  see child relationships" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v12.PortGroups" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v12.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v12.Entitlements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
-				<xml-property name="nameProps" value="vnf-name" />
-				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" />
-				<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-				<xml-property name="uniqueProps" value="vnf-id" />
-				<xml-property name="container" value="vces" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="PortGroups">
-			<xml-root-element name="port-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v12.PortGroup" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="PortGroup">
-			<xml-root-element name="port-group" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network name of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="portGroupId" name="port-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for port group in vmware" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Likely to duplicate value of neutron network name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v12.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Used to capture the network interfaces of this VCE" />
-				<xml-property name="nameProps" value="port-group-name" />
-				<xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" />
-				<xml-property name="dependentOn" value="vce" />
-				<xml-property name="container" value="port-groups" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="CvlanTags">
-			<xml-root-element name="cvlan-tags" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v12.CvlanTagEntry" />
-			</java-attributes>
-		</java-type>
+            <xml-properties>
+                <xml-property name="description" value="Collection of configurations"/>
+            </xml-properties>
+            <xml-root-element name="configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v12.Configuration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Configuration">
+            <xml-root-element name="configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID assigned to configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="port-mirroring-configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSubType" name="configuration-sub-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vprobe, pprobe."/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSelflink" name="configuration-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of  the configuration used to customize the resource"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DHV Site Effective Bandwidth"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Velocloud Nominal Throughput - VNT"/>
+                    </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.v12.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata"/>
+                <xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v12.ForwarderEvcs"/>
+                <xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v12.Evcs"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic configuration object."/>
+                <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id"/>
+                <xml-property name="uniqueProps" value="configuration-id"/>
+                <xml-property name="container" value="configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/configurations/configuration/{configuration-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="CvlanTagEntry">
-			<xml-root-element name="cvlan-tag-entry" />
-			<java-attributes>
-				<xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="See mis-na-virtualization-platform.yang" />
-					</xml-properties>
-				</xml-element>
-				<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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="dependentOn" value="port-group" />
-				<xml-property name="indexedProps" value="cvlan-tag" />
-				<xml-property name="container" value="cvlan-tags" />
-			</xml-properties>
-		</java-type>
+        <java-type name="LogicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical connections"/>
+            </xml-properties>
+            <xml-root-element name="logical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v12.LogicalLink"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LogicalLink">
+            <xml-root-element name="logical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element 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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of logical link, e.g., evc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="For example, static or BGP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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">
+                    <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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of operational status of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of the network use of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Reason for this entity, role it is playing"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/>
+                <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-property name="searchable" value="link-name"/>
+                <xml-property name="uriTemplate" value="/network/logical-links/logical-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
 
+        <java-type name="SitePairSets">
+            <xml-properties>
+                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf"/>
+            </xml-properties>
+            <xml-root-element name="site-pair-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v12.SitePairSet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SitePairSet">
+            <xml-root-element name="site-pair-set"/>
+            <java-attributes>
+                <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of site pair set."/>
+                    </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="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v12.RoutingInstances"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
+                <xml-property name="indexedProps" value="site-pair-set-id"/>
+                <xml-property name="uniqueProps" value="site-pair-set-id"/>
+                <xml-property name="container" value="site-pair-sets"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/site-pair-sets/site-pair-set/{site-pair-set-id}"/>
+            </xml-properties>
+        </java-type>
 
+        <java-type name="RoutingInstances">
+            <xml-properties>
+                <xml-property name="description" value="set of probes related to generic-vnf routing instance"/>
+            </xml-properties>
+            <xml-root-element name="routing-instances"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v12.RoutingInstance"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RoutingInstance">
+            <xml-root-element name="routing-instance"/>
+            <java-attributes>
+                <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of routing instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rpm owner"/>
+                    </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="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v12.SitePairs"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="routing-instance-id"/>
+                <xml-property name="dependentOn" value="site-pair-set"/>
+                <xml-property name="container" value="routing-instances"/>
+                <xml-property name="uriTemplate" value="/routing-instances/routing-instance/{routing-instance-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vnfcs">
-			<xml-properties>
-				<xml-property name="description" value="virtual network components associated with a vserver from application controller." />
-			</xml-properties>
-			<xml-root-element name="vnfcs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v12.Vnfc" />
-			</java-attributes>
-		</java-type>
+        <java-type name="SitePairs">
+            <xml-properties>
+                <xml-property name="description" value="probe within a set"/>
+            </xml-properties>
+            <xml-root-element name="site-pairs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v12.SitePair"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SitePair">
+            <xml-root-element name="site-pair"/>
+            <java-attributes>
+                <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version, v4, v6"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc."/>
+                    </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="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v12.ClassesOfService"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="site-pair-id"/>
+                <xml-property name="uniqueProps" value="site-pair-id"/>
+                <xml-property name="dependentOn" value="routing-instance"/>
+                <xml-property name="container" value="site-pairs"/>
+                <xml-property name="uriTemplate" value="/site-pairs/site-pair/{site-pair-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vnfc">
-			<xml-root-element name="vnfc" />
-			<java-attributes>
-				<xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of vnfc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Short code that is used in naming instances of the item being modeled" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="prov status of this vnfc" />
-					</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, mastered by APP-C" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Oam V4 vip address of this vnfc" />
-					</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)" />
-					</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="groupNotation" name="group-notation" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group notation of VNFC" />
-					</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="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="requires" value="model-invariant-id" />
-					</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.v12.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id" />
-				<xml-property name="searchable" value="vnfc-name" />
-				<xml-property name="container" value="vnfcs" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="ClassesOfService">
+            <xml-properties>
+                <xml-property name="description" value="class-of-service of probe"/>
+            </xml-properties>
+            <xml-root-element name="classes-of-service"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v12.ClassOfService"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ClassOfService">
+            <xml-root-element name="class-of-service"/>
+            <java-attributes>
+                <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type of probe"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="cos"/>
+                <xml-property name="dependentOn" value="site-pair"/>
+                <xml-property name="container" value="classes-of-service"/>
+                <xml-property name="uriTemplate" value="/classes-of-service/class-of-service/{cos}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VpnBindings">
+            <xml-root-element name="vpn-bindings"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v12.VpnBinding"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VpnBinding">
+            <xml-root-element name="vpn-binding"/>
+            <java-attributes>
+                <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN Name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="region of customer vpn"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id for this customer vpn"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network."/>
+                    </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="routeTargets" name="route-targets" type="inventory.aai.onap.org.v12.RouteTargets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList">
+                    <xml-properties>
+                        <xml-property name="description" value="l3-networks relate to vpn-bindings"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPN binding"/>
+                <xml-property name="nameProps" value="vpn-name,vpn-type"/>
+                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type"/>
+                <xml-property name="searchable" value="vpn-id,vpn-name"/>
+                <xml-property name="uniqueProps" value="vpn-id"/>
+                <xml-property name="container" value="vpn-bindings"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpn-bindings/vpn-binding/{vpn-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="L3Networks">
-			<xml-root-element name="l3-networks" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v12.L3Network" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VplsPes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VPLS Provider Edge routers"/>
+            </xml-properties>
+            <xml-root-element name="vpls-pes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v12.VplsPe"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VplsPe">
+            <xml-root-element name="vpls-pe"/>
+            <java-attributes>
+                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for stag to get to VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v12.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v12.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v12.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPLS Provider Edge routers."/>
+                <xml-property name="indexedProps" value="prov-status,equipment-name"/>
+                <xml-property name="container" value="vpls-pes"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpls-pes/vpls-pe/{equipment-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="L3Network">
-			<xml-root-element name="l3-network" />
-			<java-attributes>
-				<xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network, governed by some naming convention.." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the network - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role the network plans - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network technology - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Set to true if bound to VPN" />
-					</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 from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="network role instance" />
-					</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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered 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="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contrail FQDN for the network" />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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="physicalNetworkName" name="physical-network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name associated with the physical network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is a provider network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is a shared network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is an external network." />
-					</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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v12.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v12.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v12.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" >
-					<xml-properties>
-						<xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Generic network definition" />
-				<xml-property name="nameProps" value="network-name" />
-				<xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
-				<xml-property name="searchable" value="network-id,network-name" />
-				<xml-property name="uniqueProps" value="network-id" />
-				<xml-property name="container" value="l3-networks" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		<java-type name="NetworkPolicies">
-			<xml-root-element name="network-policies" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v12.NetworkPolicy" />
-			</java-attributes>
-		</java-type>
-		<java-type name="NetworkPolicy">
-			<xml-root-element name="network-policy" />
-			<java-attributes>
-				<xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID representing unique key to this instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contrail FQDN for the policy" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID for the openStack Heat instance" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="nameProps" value="network-policy-fqdn" />
-				<xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" />
-				<xml-property name="searchable" value="network-policy-id,network-policy-fqdn" />
-				<xml-property name="uniqueProps" value="network-policy-id" />
-				<xml-property name="container" value="network-policies" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		<java-type name="CtagAssignments">
-			<xml-root-element name="ctag-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v12.CtagAssignment" />
-			</java-attributes>
-		</java-type>
+        <java-type name="MulticastConfigurations">
+            <xml-properties>
+                <xml-property name="description" value="multicast configuration of generic-vnf ip-address"/>
+            </xml-properties>
+            <xml-root-element name="multicast-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v12.MulticastConfiguration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="MulticastConfiguration">
+            <xml-root-element name="multicast-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of multicast configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="protocol of multicast configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rp type of multicast configuration"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="multicast-configuration-id"/>
+                <xml-property name="uniqueProps" value="multicast-configuration-id"/>
+                <xml-property name="container" value="multicast-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="CtagAssignment">
-			<xml-root-element name="ctag-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="id." />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="vlan-id-inner" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<xml-property name="container" value="ctag-assignments" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated."/>
+            </xml-properties>
+            <xml-root-element name="vces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v12.Vce"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vce">
+            <xml-root-element name="vce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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 strictly map to ASDC services, 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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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="Network role being played by this VNF"/>
+                    </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, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of VPE connected to this VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Loopback0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  see child relationships"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v12.PortGroups"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v12.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v12.Entitlements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="vces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="uriTemplate" value="/network/vces/vce/{vnf-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PortGroups">
+            <xml-root-element name="port-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v12.PortGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PortGroup">
+            <xml-root-element name="port-group"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network name of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="portGroupId" name="port-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for port group in vmware"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Likely to duplicate value of neutron network name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v12.CvlanTags"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
+                <xml-property name="nameProps" value="port-group-name"/>
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+                <xml-property name="dependentOn" value="vce"/>
+                <xml-property name="container" value="port-groups"/>
+                <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CvlanTags">
+            <xml-root-element name="cvlan-tags"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v12.CvlanTagEntry"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CvlanTagEntry">
+            <xml-root-element name="cvlan-tag-entry"/>
+            <java-attributes>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
+                    </xml-properties>
+                </xml-element>
+                <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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="dependentOn" value="port-group"/>
+                <xml-property name="indexedProps" value="cvlan-tag"/>
+                <xml-property name="container" value="cvlan-tags"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Subnets">
-			<xml-root-element name="subnets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v12.Subnet" />
-			</java-attributes>
-		</java-type>
 
-		<java-type name="Subnet">
-			<xml-root-element name="subnet" />
-			<java-attributes>
-				<xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Subnet ID, should be UUID." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name associated with the subnet." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of this subnet" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="gateway ip address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="network start address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="cidr mask" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip version" />
-					</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, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="dhcp enabled" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the start address reserved for use by dhcp" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the last address reserved for use by dhcp" />
-					</xml-properties>
-				</xml-element>
-					<xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role of the subnet, referenced when assigning IPs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip address assignment direction of the subnet" />
-					</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="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="sequence of the subnet" />
-					</xml-properties>
-				</xml-element>		
-				<xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v12.HostRoutes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />				
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="subnet-id,subnet-name" />
-				<xml-property name="nameProps" value="subnet-name" />
-				<xml-property name="uniqueProps" value="subnet-id" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<xml-property name="container" value="subnets" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vnfcs">
+            <xml-properties>
+                <xml-property name="description" value="virtual network components associated with a vserver from application controller."/>
+            </xml-properties>
+            <xml-root-element name="vnfcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v12.Vnfc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vnfc">
+            <xml-root-element name="vnfc"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vnfc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Short code that is used in naming instances of the item being modeled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="prov status of this vnfc"/>
+                    </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, mastered by APP-C"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Oam V4 vip address of this vnfc"/>
+                    </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 default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="groupNotation" name="group-notation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group notation of VNFC"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <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-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.v12.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v12.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id"/>
+                <xml-property name="searchable" value="vnfc-name"/>
+                <xml-property name="container" value="vnfcs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vnfcs/vnfc/{vnfc-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="L3Networks">
+            <xml-root-element name="l3-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v12.L3Network"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="L3Network">
+            <xml-root-element name="l3-network"/>
+            <java-attributes>
+                <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network, governed by some naming convention.."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the network - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role the network plans - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network technology - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isBoundToVpn" name="is-bound-to-vpn" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Set to true if bound to VPN"/>
+                    </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 from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="network role instance"/>
+                    </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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered 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="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the network"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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="physicalNetworkName" name="physical-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the physical network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is an external network."/>
+                    </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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v12.Subnets"/>
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v12.CtagAssignments"/>
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v12.SegmentationAssignments"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList">
+                    <xml-properties>
+                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic network definition"/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+                <xml-property name="searchable" value="network-id,network-name"/>
+                <xml-property name="uniqueProps" value="network-id"/>
+                <xml-property name="container" value="l3-networks"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/l3-networks/l3-network/{network-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="NetworkPolicies">
+            <xml-root-element name="network-policies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v12.NetworkPolicy"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="NetworkPolicy">
+            <xml-root-element name="network-policy"/>
+            <java-attributes>
+                <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID representing unique key to this instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the policy"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID for the openStack Heat instance"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="nameProps" value="network-policy-fqdn"/>
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="uniqueProps" value="network-policy-id"/>
+                <xml-property name="container" value="network-policies"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/network-policies/network-policy/{network-policy-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="CtagAssignments">
+            <xml-root-element name="ctag-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v12.CtagAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CtagAssignment">
+            <xml-root-element name="ctag-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="id."/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vlan-id-inner"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="ctag-assignments"/>
+                <xml-property name="uriTemplate" value="/ctag-assignments/ctag-assignment/{vlan-id-inner}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Subnets">
+            <xml-root-element name="subnets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v12.Subnet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Subnet">
+            <xml-root-element name="subnet"/>
+            <java-attributes>
+                <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Subnet ID, should be UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the subnet."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of this subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="gateway ip address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="network start address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="cidr mask"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version"/>
+                    </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, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="dhcpEnabled" name="dhcp-enabled" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="dhcp enabled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the start address reserved for use by dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the last address reserved for use by dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the subnet, referenced when assigning IPs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip address assignment direction of the subnet"/>
+                    </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="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="sequence of the subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v12.HostRoutes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="subnet-id,subnet-name"/>
+                <xml-property name="nameProps" value="subnet-name"/>
+                <xml-property name="uniqueProps" value="subnet-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="subnets"/>
+                <xml-property name="uriTemplate" value="/subnets/subnet/{subnet-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="GenericVnfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of VNFs" />
-			</xml-properties>
-			<xml-root-element name="generic-vnfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v12.GenericVnf" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="GenericVnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VNFs"/>
+            </xml-properties>
+            <xml-root-element name="generic-vnfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v12.GenericVnf"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="GenericVnf">
-			<xml-root-element name="generic-vnf" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="GenericVnf">
+            <xml-root-element name="generic-vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="vnf instance id." />
                     </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-property name="suggestibleOnSearch" value="true"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" 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-property name="suggestibleOnSearch" value="true"/>
+                <xml-element java-attribute="vnfName" name="vnf-name" 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-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" 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-property name="suggestibleOnSearch" value="true"/>
 					</xml-properties>
 				</xml-element>
                 <xml-element java-attribute="vnfPackageName" name="vnf-package-name" required="false" type="java.lang.String">
@@ -4318,70 +4383,70 @@
                     </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-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 java-attribute="nshd" name="nshd" type="java.lang.Long">
                     <xml-properties>
                         <xml-property name="description" value="number of associated SHD in vnf." />
@@ -4397,2383 +4462,2436 @@
                         <xml-property name="description" value="number of network in vnf." />
                     </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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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-property name="suggestibleOnSearch" value="true"/>
-					</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-property name="suggestibleOnSearch" value="true"/>
-					</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="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Gateway address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length for oam-address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Temporary location for S-TAG to get to VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network Management profile of this VNF" />
-					</xml-properties>
-				</xml-element>			
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v12.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v12.VfModules" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v12.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v12.Entitlements" />
-			</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,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="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-				<xml-property name="containsSuggestibleProps" value="true"/>
-				<xml-property name="suggestionAliases" value="VNFs"/>
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VfModules">
-			<xml-properties>
-				<xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
-			</xml-properties>
-			<xml-root-element name="vf-modules" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v12.VfModule" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="VfModule">
-			<xml-root-element name="vf-module" />
-			<java-attributes>
-				<xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of vf-module." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of vf-module" />
-					</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." />
-					</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 vf-module, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" 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 base vf module" />
-					</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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the Contrail unique ID for a service-instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" />
-					</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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</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,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>
-		</java-type>
-
-
-		<java-type name="LagLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of link aggregation connections" />
-			</xml-properties>
-			<xml-root-element name="lag-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v12.LagLink" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="LagLink">
-			<xml-root-element name="lag-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="LAG links can connect lag-interfaces" />
-				<xml-property name="indexedProps" value="link-name" />
-				<xml-property name="container" value="lag-links" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Newvces">
-			<xml-properties>
-				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-			</xml-properties>
-			<xml-root-element name="newvces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v12.Newvce" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Newvce">
-			<xml-root-element name="newvce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternate name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  do not use" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Client should send valid enumerated value." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-				<xml-property name="nameProps" value="vnf-name" />
-				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" />
-				<xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" />
-				<xml-property name="uniqueProps" value="vnf-id2" />
-				<xml-property name="container" value="newvces" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Pnfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of Physical Network Functions." />
-			</xml-properties>
-			<xml-root-element name="pnfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v12.Pnf" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="Pnf">
-			<xml-root-element name="pnf" />
-			<java-attributes>
-				<xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique name of Physical Network Function." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="name of Physical Network Function." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="source of name2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id of pnf" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." />
-					</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 java-attribute="frameId" name="frame-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Serial number of the device" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 OAM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
-					</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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v12.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v12.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." />
-				<xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status" />
-				<xml-property name="searchable" value="pnf-name" />
-				<xml-property name="uniqueProps" value="pnf-name" />
-				<xml-property name="container" value="pnfs" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="PhysicalLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
-			</xml-properties>
-			<xml-root-element name="physical-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v12.PhysicalLink" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="PhysicalLink">
-			<xml-root-element name="physical-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit it" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Dual access mode (e.g., primary, secondary" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the service Provider on this link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Upstream Bandwidth value agreed with the service provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Units for the upstream BW value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Downstream Bandwidth value agreed with the service provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Units for downstream BW value" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
-				<xml-property name="indexedProps" value="circuit-id,link-name" />
-				<xml-property name="alternateKeys1" value="circuit-id" />
-				<xml-property name="container" value="physical-links" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="searchable" value="link-name,circuit-id" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VigServers">
-			<xml-root-element name="vig-servers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v12.VigServer" />
-			</java-attributes>
-		</java-type>
+                <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). 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" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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-property name="suggestibleOnSearch" value="true"/>
+                    </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-property name="suggestibleOnSearch" value="true"/>
+                    </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="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gateway address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length for oam-address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for S-TAG to get to VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network Management profile of this VNF"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v12.LagInterfaces"/>
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v12.VfModules"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v12.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v12.Entitlements"/>
+            </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,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="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="containsSuggestibleProps" value="true"/>
+                <xml-property name="suggestionAliases" value="VNFs"/>
+                <xml-property name="uriTemplate" value="/network/generic-vnfs/generic-vnf/{vnf-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VigServer">
-			<xml-root-element name="vig-server" />
-			<java-attributes>
-				<xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" >
-					<xml-properties>
-						<xml-property name="description" value="v4 IP of the vig server" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" >
-					<xml-properties>
-						<xml-property name="description" value="v6 IP of the vig server" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
-				<xml-property name="indexedProps" value="vig-address-type" />
-				<xml-property name="dependentOn" value="ipsec-configuration" />
-				<xml-property name="container" value="vig-servers" />
-			</xml-properties>
-		</java-type>
+        <java-type name="VfModules">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs"/>
+            </xml-properties>
+            <xml-root-element name="vf-modules"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v12.VfModule"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VfModule">
+            <xml-root-element name="vf-module"/>
+            <java-attributes>
+                <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vf-module."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vf-module"/>
+                    </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."/>
+                    </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 vf-module, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isBaseVfModule" name="is-base-vf-module" 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 base vf module"/>
+                    </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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the Contrail unique ID for a service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit"/>
+                    </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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </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,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-property name="uriTemplate" value="/vf-modules/vf-module/{vf-module-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="IpsecConfigurations">
-			<xml-root-element name="ipsec-configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v12.IpsecConfiguration" />
-			</java-attributes>
-		</java-type>
 
-		<java-type name="IpsecConfiguration">
-			<xml-root-element name="ipsec-configuration" />
-			<java-attributes>
-				<xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of this configuration" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network address of shared DMZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="can be 1 or 2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" />
-					</xml-properties>
-				</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-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="pre-shared key for the above group name " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Lifetime for IKEv1 SA" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="md5, sha1, sha256, sha384" />
-					</xml-properties>
-				</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-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Life time for IPSec SA" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="enable PFS or not" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The time between DPD probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" />
-					</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.v12.RelationshipList" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v12.VigServers" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
-				<xml-property name="indexedProps" value="ipsec-configuration-id" />
-				<xml-property name="uniqueProps" value="ipsec-configuration-id" />
-				<xml-property name="container" value="ipsec-configurations" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="LagLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregation connections"/>
+            </xml-properties>
+            <xml-root-element name="lag-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v12.LagLink"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LagLink">
+            <xml-root-element name="lag-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="LAG links can connect lag-interfaces"/>
+                <xml-property name="indexedProps" value="link-name"/>
+                <xml-property name="container" value="lag-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/lag-links/lag-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
 
+        <java-type name="Newvces">
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+            </xml-properties>
+            <xml-root-element name="newvces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v12.Newvce"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Newvce">
+            <xml-root-element name="newvce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v12.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2"/>
+                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id2"/>
+                <xml-property name="container" value="newvces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/newvces/newvce/{vnf-id2}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="NotificationEvent">
-			<xml-root-element name="notification-event" />
-			<java-attributes>
-				<xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" />
-				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v12.NotificationEventHeader" />
-				<xml-any-element java-attribute="entity" />
-			</java-attributes>
-		</java-type>
-		<java-type name="NotificationEventHeader">
-			<xml-root-element name="notification-event-header" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" type="java.lang.String" />
-				<xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" />
-				<xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" />
-				<xml-element java-attribute="domain" name="domain" type="java.lang.String" />
-				<xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" />
-				<xml-element java-attribute="severity" name="severity" type="java.lang.String" />
-				<xml-element java-attribute="eventType" name="event-type" type="java.lang.String" />
-				<xml-element java-attribute="version" name="version" type="java.lang.String" />
-				<xml-element java-attribute="action" name="action" type="java.lang.String" />
-				<xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" />
-				<xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" />
-				<xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" />
-				<xml-element java-attribute="status" name="status" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-		<java-type name="AaiInternal">
-			<xml-root-element name="aai-internal" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v12.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v12.EdgePropNames" />
-			</java-attributes>
-		</java-type>
-		<java-type name="ReservedPropNames">
-			<xml-properties>
-				<xml-property name="description" value="Internal map to define some reserved properties of a vertex" />
-				<xml-property name="uniqueProps" value="aai-unique-key" />
-				<xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri" />
-			</xml-properties>
-			<xml-root-element name="reserved-prop-names" />
-			<java-attributes>
-				<xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" />
-				<xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String" />
-				<xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" />
-				<xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" />
-				<xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" />
-				<xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" />
-				<xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-		<java-type name="EdgePropNames">
-			<!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
-			<xml-properties>
-				<xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" />
-				<xml-property name="edgeInfo" value="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
-                <xml-property name="uniqueProps" value="aai-uuid" />
-                <xml-property name="indexedProps" value="aai-uuid" />
+        <java-type name="Pnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Physical Network Functions."/>
             </xml-properties>
-			<xml-root-element name="edge-prop-names" />
-			<java-attributes>
-				<xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
-				<xml-element java-attribute="direction" name="direction" type="java.lang.String" />
-				<xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
-				<xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String" />
-				<xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String" />
-				<xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String" />
-				<xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String" />
-				<xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+            <xml-root-element name="pnfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v12.Pnf"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Models">
-			<xml-properties>
-				<xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" />
-			</xml-properties>
-			<xml-root-element name="models" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v12.Model" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Pnf">
+            <xml-root-element name="pnf"/>
+            <java-attributes>
+                <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique name of Physical Network Function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name of Physical Network Function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="source of name2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of pnf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF."/>
+                    </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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number of the device"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                    </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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v12.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v12.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
+                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status"/>
+                <xml-property name="searchable" value="pnf-name"/>
+                <xml-property name="uniqueProps" value="pnf-name"/>
+                <xml-property name="container" value="pnfs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/pnfs/pnf/{pnf-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Model">
-			<xml-root-element name="model" />
-			<xml-properties>
-				<xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version" />
-				<xml-property name="nameProps" value="model-type" />
-				<xml-property name="indexedProps" value="model-invariant-id,model-type" />
-				<xml-property name="uniqueProps" value="model-invariant-id" />
-				<xml-property name="container" value="models" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
-					</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="modelVers" name="model-vers" type="inventory.aai.onap.org.v12.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="PhysicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+            </xml-properties>
+            <xml-root-element name="physical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v12.PhysicalLink"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
+        <java-type name="PhysicalLink">
+            <xml-root-element name="physical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit it"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the service Provider on this link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for the upstream BW value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for downstream BW value"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+                <xml-property name="indexedProps" value="circuit-id,link-name"/>
+                <xml-property name="alternateKeys1" value="circuit-id"/>
+                <xml-property name="container" value="physical-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="searchable" value="link-name,circuit-id"/>
+                <xml-property name="uriTemplate" value="/network/physical-links/physical-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VigServers">
+            <xml-root-element name="vig-servers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v12.VigServer"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VigServer">
+            <xml-root-element name="vig-server"/>
+            <java-attributes>
+                <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4 IP of the vig server"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v6 IP of the vig server"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607"/>
+                <xml-property name="indexedProps" value="vig-address-type"/>
+                <xml-property name="dependentOn" value="ipsec-configuration"/>
+                <xml-property name="container" value="vig-servers"/>
+                <xml-property name="uriTemplate" value="/vig-servers/vig-server/{vig-address-type}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="IpsecConfigurations">
+            <xml-root-element name="ipsec-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v12.IpsecConfiguration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="IpsecConfiguration">
+            <xml-root-element name="ipsec-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of this configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network address of shared DMZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="can be 1 or 2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384"/>
+                    </xml-properties>
+                </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-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="pre-shared key for the above group name "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Lifetime for IKEv1 SA"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="md5, sha1, sha256, sha384"/>
+                    </xml-properties>
+                </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-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Life time for IPSec SA"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="enable PFS or not"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The time between DPD probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down"/>
+                    </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.v12.RelationshipList"/>
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v12.VigServers"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
+                <xml-property name="indexedProps" value="ipsec-configuration-id"/>
+                <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
+                <xml-property name="container" value="ipsec-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}"/>
+            </xml-properties>
+        </java-type>
+
+
+        <java-type name="NotificationEvent">
+            <xml-root-element name="notification-event"/>
+            <java-attributes>
+                <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String"/>
+                <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v12.NotificationEventHeader"/>
+                <xml-any-element java-attribute="entity"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="NotificationEventHeader">
+            <xml-root-element name="notification-event-header"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" type="java.lang.String"/>
+                <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String"/>
+                <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String"/>
+                <xml-element java-attribute="domain" name="domain" type="java.lang.String"/>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String"/>
+                <xml-element java-attribute="severity" name="severity" type="java.lang.String"/>
+                <xml-element java-attribute="eventType" name="event-type" type="java.lang.String"/>
+                <xml-element java-attribute="version" name="version" type="java.lang.String"/>
+                <xml-element java-attribute="action" name="action" type="java.lang.String"/>
+                <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String"/>
+                <xml-element java-attribute="status" name="status" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="AaiInternal">
+            <xml-root-element name="aai-internal"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v12.ReservedPropNames"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v12.EdgePropNames"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ReservedPropNames">
+            <xml-properties>
+                <xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
+                <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
+                <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
+            </xml-properties>
+            <xml-root-element name="reserved-prop-names"/>
+            <java-attributes>
+                <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String"/>
+                <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long"/>
+                <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String"/>
+                <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long"/>
+                <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String"/>
+                <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String"/>
+                <xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="EdgePropNames">
+            <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
+            <xml-properties>
+                <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules"/>
+                <xml-property name="edgeInfo" value="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV"/>
+                <xml-property name="uniqueProps" value="aai-uuid"/>
+                <xml-property name="indexedProps" value="aai-uuid"/>
+            </xml-properties>
+            <xml-root-element name="edge-prop-names"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String"/>
+                <xml-element java-attribute="direction" name="direction" type="java.lang.String"/>
+                <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String"/>
+                <xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String"/>
+                <xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String"/>
+                <xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String"/>
+                <xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String"/>
+                <xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Models">
+            <xml-properties>
+                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models"/>
+            </xml-properties>
+            <xml-root-element name="models"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v12.Model"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Model">
+            <xml-root-element name="model"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version"/>
+                <xml-property name="nameProps" value="model-type"/>
+                <xml-property name="indexedProps" value="model-invariant-id,model-type"/>
+                <xml-property name="uniqueProps" value="model-invariant-id"/>
+                <xml-property name="container" value="models"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/models/model/{model-invariant-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                    </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="modelVers" name="model-vers" type="inventory.aai.onap.org.v12.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelVers">
-			<xml-root-element name="model-vers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v12.ModelVer" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ModelVer">
-			<xml-root-element name="model-ver" />
-			<xml-properties>
-				<xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" />
-				<xml-property name="nameProps" value="model-name" />
-				<xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status" />
-				<xml-property name="uniqueProps" value="model-version-id" />
-				<xml-property name="container" value="model-vers" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the model, which can change from version to version." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Distribution Status" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description" />
-					</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="modelElements" name="model-elements" type="inventory.aai.onap.org.v12.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-		</java-type>
 
-		<java-type name="ModelElements">
-			<xml-root-element name="model-elements" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v12.ModelElement" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelVers">
+            <xml-root-element name="model-vers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v12.ModelVer"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelElement">
-			<xml-properties>
-				<xml-property name="description" value="Defines how other models combine to make up a higher-level model." />
-				<xml-property name="uniqueProps" value="model-element-uuid" />
-				<xml-property name="indexedProps" value="model-element-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="model-elements" />
-			</xml-properties>
-			<xml-root-element name="model-element" />
-			<java-attributes>
-				<xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="How many of this type of element are required/allowed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" >
-				</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="modelElements" name="model-elements" type="inventory.aai.onap.org.v12.ModelElements">
-					<xml-properties>
-						<xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v12.ModelConstraints">
-					<xml-properties>
-						<xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelVer">
+            <xml-root-element name="model-ver"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models"/>
+                <xml-property name="nameProps" value="model-name"/>
+                <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status"/>
+                <xml-property name="uniqueProps" value="model-version-id"/>
+                <xml-property name="container" value="model-vers"/>
+                <xml-property name="uriTemplate" value="/model-vers/model-ver/{model-version-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Distribution Status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description"/>
+                    </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="modelElements" name="model-elements" type="inventory.aai.onap.org.v12.ModelElements"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v12.Metadata"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelElements">
+            <xml-root-element name="model-elements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v12.ModelElement"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelElement">
+            <xml-properties>
+                <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
+                <xml-property name="uniqueProps" value="model-element-uuid"/>
+                <xml-property name="indexedProps" value="model-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-elements"/>
+                <xml-property name="uriTemplate" value="/model-elements/model-element/{model-element-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="model-element"/>
+            <java-attributes>
+                <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many of this type of element are required/allowed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String">
+                </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="modelElements" name="model-elements" type="inventory.aai.onap.org.v12.ModelElements">
+                    <xml-properties>
+                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v12.ModelConstraints">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelConstraints">
+            <xml-root-element name="model-constraints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v12.ModelConstraint"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelConstraint">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="model-constraint-uuid"/>
+                <xml-property name="indexedProps" value="model-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-constraints"/>
+                <xml-property name="uriTemplate" value="/model-constraints/model-constraint/{model-constraint-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="model-constraint"/>
+            <java-attributes>
+                <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v12.ConstrainedElementSets"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelConstraints">
-			<xml-root-element name="model-constraints" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v12.ModelConstraint" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ConstrainedElementSets">
+            <xml-root-element name="constrained-element-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v12.ConstrainedElementSet"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelConstraint">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="model-constraint-uuid" />
-				<xml-property name="indexedProps" value="model-constraint-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="model-constraints" />
-			</xml-properties>
-			<xml-root-element name="model-constraint" />
-			<java-attributes>
-				<xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v12.ConstrainedElementSets" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
+        <java-type name="ConstrainedElementSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
+                <xml-property name="indexedProps" value="constrained-element-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="constrained-element-sets"/>
+                <xml-property name="uriTemplate" value="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="constrained-element-set"/>
+            <java-attributes>
+                <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v12.ElementChoiceSets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ElementChoiceSets">
+            <xml-root-element name="element-choice-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v12.ElementChoiceSet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ElementChoiceSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
+                <xml-property name="indexedProps" value="element-choice-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="element-choice-sets"/>
+                <xml-property name="uriTemplate" value="/element-choice-sets/element-choice-set/{element-choice-set-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="element-choice-set"/>
+            <java-attributes>
+                <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v12.ModelElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NamedQueries">
+            <xml-root-element name="named-queries"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v12.NamedQuery"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NamedQuery">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="nameProps" value="named-query-name"/>
+                <xml-property name="uniqueProps" value="named-query-uuid"/>
+                <xml-property name="indexedProps" value="named-query-uuid,named-query-name"/>
+                <xml-property name="container" value="named-queries"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/named-queries/named-query/{named-query-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="named-query"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String">
+                    <xml-element-wrapper name="required-input-params"/>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v12.NamedQueryElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NamedQueryElements">
+            <xml-root-element name="named-query-elements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v12.NamedQueryElement"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NamedQueryElement">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="named-query-element-uuid"/>
+                <xml-property name="indexedProps" value="named-query-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="named-query-elements"/>
+                <xml-property name="uriTemplate" value="/named-query-elements/named-query-element/{named-query-element-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="named-query-element"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String"/>
+                <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v12.NamedQueryElements"/>
+                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v12.RelatedLookups"/>
+                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v12.PropertyConstraints"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelatedLookups">
+            <xml-root-element name="related-lookups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v12.RelatedLookup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelatedLookup">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="related-lookup-uuid"/>
+                <xml-property name="indexedProps" value="related-lookup-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="related-lookups"/>
+                <xml-property name="uriTemplate" value="/related-lookups/related-lookup/{related-lookup-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="related-lookup"/>
+            <java-attributes>
+                <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PropertyConstraints">
+            <xml-root-element name="property-constraints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v12.PropertyConstraint"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PropertyConstraint">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="property-constraint-uuid"/>
+                <xml-property name="indexedProps" value="property-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="property-constraints"/>
+                <xml-property name="uriTemplate" value="/property-constraints/property-constraint/{property-constraint-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="property-constraint"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelAndNamedQuerySearch">
+            <xml-properties>
+                <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="model-and-named-query-search"/>
+            <java-attributes>
+                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v12.QueryParameters"/>
+                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v12.InstanceFilters"/>
+                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v12.SecondaryFilts"/>
+                <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="QueryParameters">
+            <xml-properties>
+                <xml-property name="description" value="QueryParameters for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="query-parameters"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v12.NamedQuery"/>
+                <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v12.OverloadedModel"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OverloadedModel">
+            <xml-root-element name="overloaded-model"/>
+            <xml-properties>
+                <xml-property name="description" value="Allows for legacy POST of old-style and new-style models"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Invariant unique ID which does not change from version to version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description"/>
+                    </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="modelVers" name="model-vers" type="inventory.aai.onap.org.v12.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ConstrainedElementSets">
-			<xml-root-element name="constrained-element-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v12.ConstrainedElementSet" />
-			</java-attributes>
-		</java-type>
+        <java-type name="InstanceFilters">
+            <xml-properties>
+                <xml-property name="description" value="InstanceFilters for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="instance-filters"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v12.InstanceFilter"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ConstrainedElementSet">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="constrained-element-set-uuid" />
-				<xml-property name="indexedProps" value="constrained-element-set-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="constrained-element-sets" />
-			</xml-properties>
-			<xml-root-element name="constrained-element-set" />
-			<java-attributes>
-				<xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v12.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="InstanceFilter">
+            <xml-properties>
+                <xml-property name="description" value="InstanceFilter for performing a named-query or model query"/>
+                <xml-property name="container" value="instance-filters"/>
+            </xml-properties>
+            <xml-root-element name="instance-filter"/>
+            <java-attributes>
+                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ElementChoiceSets">
-			<xml-root-element name="element-choice-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v12.ElementChoiceSet" />
-			</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-properties>
+            <xml-root-element name="secondary-filts"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v12.SecondaryFilt"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ElementChoiceSet">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="element-choice-set-uuid" />
-				<xml-property name="indexedProps" value="element-choice-set-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="element-choice-sets" />
-			</xml-properties>
-			<xml-root-element name="element-choice-set" />
-			<java-attributes>
-				<xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v12.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</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-properties>
+            <xml-root-element name="secondary-filt"/>
+            <java-attributes>
+                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="NamedQueries">
-			<xml-root-element name="named-queries" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v12.NamedQuery" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Properties">
+            <xml-properties>
+                <xml-property name="description" value="Property holder for query properties or instance properties"/>
+            </xml-properties>
+            <xml-root-element name="properties"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ResponseList">
+            <xml-properties>
+                <xml-property name="description" value="Response container for the results of a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="response-list"/>
+            <java-attributes>
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v12.InventoryResponseItems"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="NamedQuery">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="nameProps" value="named-query-name" />
-				<xml-property name="uniqueProps" value="named-query-uuid" />
-				<xml-property name="indexedProps" value="named-query-uuid,named-query-name" />
-				<xml-property name="container" value="named-queries" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-			<xml-root-element name="named-query" />
-			<java-attributes>
-				<xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String" >
-					<xml-element-wrapper name="required-input-params" />
-				</xml-element>
-				<xml-element java-attribute="description" name="description" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v12.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="InventoryResponseItems">
+            <xml-properties>
+                <xml-property name="description" value="Container for inventory items in response list"/>
+                <xml-property name="container" value="response-list"/>
+            </xml-properties>
+            <xml-root-element name="inventory-response-items"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v12.InventoryResponseItem"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="NamedQueryElements">
-			<xml-root-element name="named-query-elements" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v12.NamedQueryElement" />
-			</java-attributes>
-		</java-type>
+        <java-type name="InventoryResponseItem">
+            <xml-properties>
+                <xml-property name="description" value="Inventory item for response list"/>
+                <xml-property name="container" value="inventory-response-items"/>
+            </xml-properties>
+            <xml-root-element name="inventory-response-item"/>
+            <java-attributes>
+                <xml-element java-attribute="modelName" name="model-name" type="java.lang.String"/>
+                <xml-any-element java-attribute="item"/>
+                <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v12.ExtraProperties"/>
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v12.InventoryResponseItems"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ExtraProperties">
+            <xml-properties>
+                <xml-property name="description" value="Extra properties for inventory item for response list"/>
+            </xml-properties>
+            <xml-root-element name="extra-properties"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v12.ExtraProperty"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ExtraProperty">
+            <xml-root-element name="extra-property"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RouteTableReferences">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="route-table-references"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v12.RouteTableReference"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RouteTableReference">
+            <xml-root-element name="route-table-reference"/>
+            <java-attributes>
+                <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="FQDN entry in the route table."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
 
-		<java-type name="NamedQueryElement">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="uniqueProps" value="named-query-element-uuid" />
-				<xml-property name="indexedProps" value="named-query-element-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="named-query-elements" />
-			</xml-properties>
-			<xml-root-element name="named-query-element" />
-			<java-attributes>
-				<xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
-				<xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v12.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v12.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v12.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-		</java-type>
+            <xml-properties>
+                <xml-property name="description" value="Openstack route table reference."/>
+                <xml-property name="nameProps" value="route-table-reference-fqdn"/>
+                <xml-property name="uniqueProps" value="route-table-reference-id"/>
+                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+                <xml-property name="container" value="route-table-references"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/route-table-references/route-table-reference/{route-table-reference-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="RelatedLookups">
-			<xml-root-element name="related-lookups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v12.RelatedLookup" />
-			</java-attributes>
-		</java-type>
+        <java-type name="InstanceGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="instance-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v12.InstanceGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InstanceGroup">
+            <xml-root-element name="instance-group"/>
+            <java-attributes>
+                <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the instance group."/>
+                    </xml-properties>
+                </xml-element>
 
-		<java-type name="RelatedLookup">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="uniqueProps" value="related-lookup-uuid" />
-				<xml-property name="indexedProps" value="related-lookup-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="related-lookups" />
-			</xml-properties>
-			<xml-root-element name="related-lookup" />
-			<java-attributes>
-				<xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-		</java-type>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
 
-		<java-type name="PropertyConstraints">
-			<xml-root-element name="property-constraints" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v12.PropertyConstraint" />
-			</java-attributes>
-		</java-type>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model version uid for this resource model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Only valid value today is lower case ha for high availability"/>
+                        <xml-property name="dbAlias" value="instance-group-type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subType" name="sub-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
 
-		<java-type name="PropertyConstraint">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="uniqueProps" value="property-constraint-uuid" />
-				<xml-property name="indexedProps" value="property-constraint-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="property-constraints" />
-			</xml-properties>
-			<xml-root-element name="property-constraint" />
-			<java-attributes>
-				<xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+            <xml-properties>
+                <xml-property name="description" value="General mechanism for grouping instances"/>
+                <xml-property name="nameProps" value="description"/>
+                <xml-property name="uniqueProps" value="id"/>
+                <xml-property name="searchable" value="id,description"/>
+                <xml-property name="indexedProps" value="id,description,type,sub-type"/>
+                <xml-property name="container" value="instance-groups"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ModelAndNamedQuerySearch">
-			<xml-properties>
-				<xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="model-and-named-query-search" />
-			<java-attributes>
-				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v12.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v12.InstanceFilters" />
-				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v12.SecondaryFilts" />
-				<xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" />
-				<xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
 
-		<java-type name="QueryParameters">
-			<xml-properties>
-				<xml-property name="description" value="QueryParameters for performing a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="query-parameters" />
-			<java-attributes>
-				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v12.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v12.OverloadedModel" />
-			</java-attributes>
-		</java-type>
+        <java-type name="SegmentationAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack segmentation assignments"/>
+            </xml-properties>
+            <xml-root-element name="segmentation-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v12.SegmentationAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SegmentationAssignment">
+            <xml-root-element name="segmentation-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack segmentation assignment."/>
+                <xml-property name="indexedProps" value="segmentation-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="segmentation-assignments"/>
+                <xml-property name="uriTemplate" value="/segmentation-assignments/segmentation-assignment/{segmentation-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="OverloadedModel">
-			<xml-root-element name="overloaded-model" />
-			<xml-properties>
-				<xml-property name="description" value="Allows for legacy POST of old-style and new-style models" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the model, which can change from version to version." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Invariant unique ID which does not change from version to version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description" />
-					</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="modelVers" name="model-vers" type="inventory.aai.onap.org.v12.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-		</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-properties>
+            <xml-root-element name="allotted-resources"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v12.AllottedResource"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AllottedResource">
+            <xml-root-element name="allotted-resource"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Link back to more information in the controller"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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-properties>
+                        <xml-property name="description" value="Concurrency 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"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Generic description of the type of allotted resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role in the network that this resource will be providing."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v12.TunnelXconnects"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
 
-		<java-type name="InstanceFilters">
-			<xml-properties>
-				<xml-property name="description" value="InstanceFilters for performing a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="instance-filters" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v12.InstanceFilter" />
-			</java-attributes>
-		</java-type>
+            <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,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-property name="uriTemplate" value="/allotted-resources/allotted-resource/{id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="InstanceFilter">
-			<xml-properties>
-				<xml-property name="description" value="InstanceFilter for performing a named-query or model query" />
-				<xml-property name="container" value="instance-filters" />
-			</xml-properties>
-			<xml-root-element name="instance-filter" />
-			<java-attributes>
-				<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-properties>
-			<xml-root-element name="secondary-filts" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v12.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-properties>
-			<xml-root-element name="secondary-filt" />
-			<java-attributes>
-				<xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
-			</java-attributes>
-		</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-properties>
+            <xml-root-element name="tunnel-xconnects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v12.TunnelXconnect"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="TunnelXconnect">
+            <xml-root-element name="tunnel-xconnect"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN1"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN1"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
 
-		<java-type name="Properties">
-			<xml-properties>
-				<xml-property name="description" value="Property holder for query properties or instance properties" />
-			</xml-properties>
-			<xml-root-element name="properties" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+            <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="indexedProps" value="id"/>
+                <xml-property name="dependentOn" value="allotted-resource"/>
+                <xml-property name="container" value="tunnel-xconnects"/>
+                <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/tunnel-xconnects/tunnel-xconnect/{id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ResponseList">
-			<xml-properties>
-				<xml-property name="description" value="Response container for the results of a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="response-list" />
-			<java-attributes>
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v12.InventoryResponseItems" />
-			</java-attributes>
-		</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-properties>
+            <xml-root-element name="entitlements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v12.Entitlement"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Entitlement">
+            <xml-root-element name="entitlement"/>
+            <java-attributes>
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of an entitlement resource. "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </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"/>
+                <xml-property name="container" value="entitlements"/>
+                <xml-property name="uriTemplate" value="/entitlements/entitlement/{group-uuid}/{resource-uuid}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="InventoryResponseItems">
-			<xml-properties>
-				<xml-property name="description" value="Container for inventory items in response list" />
-				<xml-property name="container" value="response-list" />
-			</xml-properties>
-			<xml-root-element name="inventory-response-items" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v12.InventoryResponseItem" />
-			</java-attributes>
-		</java-type>
 
-		<java-type name="InventoryResponseItem">
-			<xml-properties>
-				<xml-property name="description" value="Inventory item for response list" />
-				<xml-property name="container" value="inventory-response-items" />
-			</xml-properties>
-			<xml-root-element name="inventory-response-item" />
-			<java-attributes>
-				<xml-element java-attribute="modelName" name="model-name" type="java.lang.String" />
-				<xml-any-element java-attribute="item" />
-				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v12.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v12.InventoryResponseItems" />
-			</java-attributes>
-		</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-properties>
+            <xml-root-element name="licenses"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v12.License"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="License">
+            <xml-root-element name="license"/>
+            <java-attributes>
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of a license resource. "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </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"/>
+                <xml-property name="container" value="licenses"/>
+                <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ExtraProperties">
-			<xml-properties>
-				<xml-property name="description" value="Extra properties for inventory item for response list" />
-			</xml-properties>
-			<xml-root-element name="extra-properties" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v12.ExtraProperty" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Vnf">
+            <xml-root-element name="vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Abstract vnf class"/>
+                <xml-property name="indexedProps" value="vnf-id"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="inheritors" value="vce,generic-vnf"/>
+                <xml-property name="abstract" value="true"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ExtraProperty">
-			<xml-root-element name="extra-property" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="RouteTableReferences">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack route table references" />
-			</xml-properties>
-			<xml-root-element name="route-table-references" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v12.RouteTableReference" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="RouteTableReference">
-			<xml-root-element name="route-table-reference" />
-			<java-attributes>
-				<xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="FQDN entry in the route table." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.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="uniqueProps" value="route-table-reference-id" />
-				<xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" />
-				<xml-property name="container" value="route-table-references" />
-				<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-properties>
-			<xml-root-element name="instance-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v12.InstanceGroup" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="InstanceGroup">
-			<xml-root-element name="instance-group" />
-			<java-attributes>
-				<xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role of the instance group." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="Zones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of zones"/>
+            </xml-properties>
+            <xml-root-element name="zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v12.Zone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Zone">
+            <xml-root-element name="zone"/>
+            <java-attributes>
+                <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Code assigned by AIC to the zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English name associated with the zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Design of zone [Medium/Large…]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Context of zone [production/test]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status of a zone."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB"/>
+                <xml-property name="nameProps" value="zone-name"/>
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context"/>
+                <xml-property name="uniqueProps" value="zone-id"/>
+                <xml-property name="container" value="zones"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
+            </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.v12.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" type="java.lang.String" xml-key="true">
+                    <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" type="java.lang.String" xml-key="true">
+                    <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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Route target information"/>
+                <xml-property name="container" value="route-targets"/>
+                <xml-property name="dependentOn" value="vpn-binding"/>
+                <xml-property name="canBeLinked" value="true"/>
+                <xml-property name="uriTemplate" value="/route-targets/route-target/{global-route-target}/{route-target-role}"/>
+            </xml-properties>
+        </java-type>
 
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ASDC model id for this resource or service model." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="SriovPfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Physical Functions."/>
+            </xml-properties>
+            <xml-root-element name="sriov-pfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v12.SriovPf"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovPf">
+            <xml-root-element name="sriov-pf"/>
+            <java-attributes>
+                <xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier for the sriov-pf"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Physical Function"/>
+                <xml-property name="indexedProps" value="pf-pci-id"/>
+                <xml-property name="dependentOn" value="p-interface"/>
+                <xml-property name="container" value="sriov-pfs"/>
+                <xml-property name="uriTemplate" value="/sriov-pfs/sriov-pf/{pf-pci-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="HostRoutes">
+            <xml-root-element name="host-routes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v12.HostRoute"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="HostRoute">
+            <xml-root-element name="host-route"/>
+            <java-attributes>
+                <xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="host-route id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="subnet prefix"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop"/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="host-route-id"/>
+                <xml-property name="dependentOn" value="subnet"/>
+                <xml-property name="container" value="host-routes"/>
+                <xml-property name="uriTemplate" value="/host-routes/host-route/{host-route-id}"/>
+            </xml-properties>
+        </java-type>
 
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ASDC model version uid for this resource model." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Only valid value today is lower case ha for high availability" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subType" name="sub-type"  type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			
-			<xml-properties>
-				<xml-property name="description" value="General mechanism for grouping instances" />
-				<xml-property name="nameProps" value="description" />
-				<xml-property name="uniqueProps" value="id" />
-				<xml-property name="searchable" value="id,description"/>
-				<xml-property name="indexedProps" value="id,description,type,sub-type" />
-				<xml-property name="container" value="instance-groups" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		
+        <java-type name="VipIpv4AddressList">
+            <xml-root-element name="vip-ipv4-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+            <xml-property name="uriTemplate" value="/vip-ipv4-address-list/{vip-ipv4-address}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="SegmentationAssignments">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack segmentation assignments" />
-			</xml-properties>
-			<xml-root-element name="segmentation-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v12.SegmentationAssignment" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="SegmentationAssignment">
-			<xml-root-element name="segmentation-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack segmentation assignment." />
-				<xml-property name="indexedProps" value="segmentation-id" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<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-properties>
-			<xml-root-element name="allotted-resources" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v12.AllottedResource" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="AllottedResource">
-			<xml-root-element name="allotted-resource" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="description" name="description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The descriptive information assigned to this allotted resource instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Link back to more information in the controller" />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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-properties>
-						<xml-property name="description" value="Concurrency 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" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="type" name="type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Generic description of the type of allotted resource." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="role" name="role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role in the network that this resource will be providing." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v12.TunnelXconnects" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.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,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 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-properties>
-			<xml-root-element name="tunnel-xconnects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v12.TunnelXconnect" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="TunnelXconnect">
-			<xml-root-element name="tunnel-xconnect" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN uplink bandwidth for WAN1" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN downlink bandwidth for WAN1" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN uplink bandwidth for WAN2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN downlink bandwidth for WAN2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.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="indexedProps" value="id" />
-				<xml-property name="dependentOn" value="allotted-resource" />
-				<xml-property name="container" value="tunnel-xconnects" />
-				<!--  <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-properties>
-			<xml-root-element name="entitlements" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v12.Entitlement" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="Entitlement">
-			<xml-root-element name="entitlement" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of an entitlement resource. " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</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" />
-				<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-properties>
-			<xml-root-element name="licenses" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v12.License" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="License">
-			<xml-root-element name="license" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of a license resource. " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</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" />
-				<xml-property name="container" value="licenses" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="Vnf">
-			<xml-root-element name="vnf"/>
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Abstract vnf class" />
-				<xml-property name="indexedProps" value="vnf-id" />
-				<xml-property name="uniqueProps" value="vnf-id" />
-				<xml-property name="inheritors" value="vce,generic-vnf" />
-				<xml-property name="abstract" value="true" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="Zones">
-			<xml-properties>
-				<xml-property name="description" value="Collection of zones" />
-			</xml-properties>
-			<xml-root-element name="zones" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v12.Zone" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VipIpv6AddressList">
+            <xml-root-element name="vip-ipv6-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+            <xml-property name="uriTemplate" value="/vip-ipv6-address-list/{vip-ipv6-address}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Zone">
-			<xml-root-element name="zone" />
-			<java-attributes>
-				<xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Code assigned by AIC to the zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="English name associated with the zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Design of zone [Medium/Large…]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Context of zone [production/test]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="status" name="status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Status of a zone." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
-				<xml-property name="nameProps" value="zone-name" />
-				<xml-property name="indexedProps" value="zone-id,design-type,zone-context" />
-				<xml-property name="uniqueProps" value="zone-id" />
-				<xml-property name="container" value="zones" />
-				<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.v12.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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Route target information" />
-				<xml-property name="container" value="route-targets" />
-				<xml-property name="dependentOn" value="vpn-binding" />
-				<xml-property name="canBeLinked" value="true" />
-			</xml-properties>
-		</java-type>
-						
-		<java-type name="SriovPfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of SR-IOV Physical Functions." />
-			</xml-properties>
-			<xml-root-element name="sriov-pfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v12.SriovPf" />
-			</java-attributes>
-		</java-type>
-		<java-type name="SriovPf">
-			<xml-root-element name="sriov-pf" />
-			<java-attributes>
-				<xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Identifier for the sriov-pf" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="SR-IOV Physical Function" />
-				<xml-property name="indexedProps" value="pf-pci-id" />
-				<xml-property name="dependentOn" value="p-interface" />
-				<xml-property name="container" value="sriov-pfs" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="HostRoutes">
-			<xml-root-element name="host-routes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v12.HostRoute" />
-			</java-attributes>
-		</java-type>
-		<java-type name="HostRoute">
-			<xml-root-element name="host-route" />
-			<java-attributes>
-				<xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="host-route id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="subnet prefix" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Could be ip-address, hostname, or service-instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop" />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="host-route-id" />
-				<xml-property name="dependentOn" value="subnet" />
-				<xml-property name="container" value="host-routes" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="VipIpv4AddressList">
-			<xml-root-element name="vip-ipv4-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 32 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv4 Address Range" />
-				<xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="VipIpv6AddressList">
-			<xml-root-element name="vip-ipv6-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 128 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv6 Address Range" />
-				<xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="OperationalEnvironments">
-			<xml-properties>
-				<xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC." />
-			</xml-properties>
-			<xml-root-element name="operational-environments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v12.OperationalEnvironment" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="OperationalEnvironments">
+            <xml-properties>
+                <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
+            </xml-properties>
+            <xml-root-element name="operational-environments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v12.OperationalEnvironment"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="OperationalEnvironment">
-			<xml-root-element name="operational-environment" />
-			<java-attributes>
-				<xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of an operational environment" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational Environment name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational Environment Type." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Status" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Tenant Context." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="workloadContext" name="workload-context" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Workload Context." />
-					</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.v12.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC." />
-				<xml-property name="indexedProps" value="operational-environment-id" />
-				<xml-property name="nameProps" value="operational-environment-name" />
-				<xml-property name="uniqueProps" value="operational-environment-id" />
-				<xml-property name="container" value="operational-environments" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="ForwardingPaths">
-			<xml-root-element name="forwarding-paths" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v12.ForwardingPath" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ForwardingPath">
-			<xml-root-element name="forwarding-path"/>
-			<xml-properties>
-				<xml-property name="namespace" value="network"/>
-				<xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name"/>
-				<xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
-			  <xml-property name="container" value="forwarding-paths" />
-			  <xml-property name="nameProps" value="forwarding-path-name" />
-			  <xml-property name="uniqueProps" value="forwarding-path-id" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of this FP"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the FP"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
-				<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="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the self link for this FP"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v12.Forwarders" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="Forwarders">
-			<xml-root-element name="forwarders" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v12.Forwarder" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="Forwarder">
-			<xml-root-element name="forwarder"/>
-			<xml-properties>
-				<xml-property name="indexedProps" value="sequence"/>
-				<xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
-				<xml-property name="container" value="forwarders" />
-				<xml-property name="dependentOn" value="forwarding-path" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of this segmentation"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ingress, intermediate, egress"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
-				<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>
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ForwarderEvcs">
-			<xml-root-element name="forwarder-evcs"/>
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v12.ForwarderEvc"/>
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ForwarderEvc">
-			<xml-root-element name="forwarder-evc"/>
-			<java-attributes>
-				<xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Key for forwarder-evc object"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Internal VLAN." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="SVLAN value for ingress of egress forwarder." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CVLAN value for ingress of egress forwarder." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
-				<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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="forwarder object is an optional child object of the Configuration object." />
-				<xml-property name="dependentOn" value="configuration" />
-				<xml-property name="uniqueProps" value="forwarder-evc-id" />
-				<xml-property name="container" value="forwarder-evcs" />
-			</xml-properties>
-		</java-type>
+        <java-type name="OperationalEnvironment">
+            <xml-root-element name="operational-environment"/>
+            <java-attributes>
+                <xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an operational environment"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operational Environment name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operational Environment Type."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Tenant Context."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Workload Context."/>
+                    </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.v12.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
+                <xml-property name="indexedProps" value="operational-environment-id"/>
+                <xml-property name="nameProps" value="operational-environment-name"/>
+                <xml-property name="uniqueProps" value="operational-environment-id"/>
+                <xml-property name="container" value="operational-environments"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Evcs">
-			<xml-root-element name="evcs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v12.Evc" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ForwardingPaths">
+            <xml-root-element name="forwarding-paths"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v12.ForwardingPath"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Evc">
-			<xml-root-element name="evc" />
-			<java-attributes>
-				<xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique/key field for the evc object" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Point-to-Point, Multi-Point" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Commited Information Rate" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CIR units" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Diversity Group ID" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="formerly Performance Group" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="EVC Circuit ID of ESP EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Committed Information Rate (For ESP)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CIR units (For ESP)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Identifies ESP" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Interconnect type on ingress side of EVC." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="tagode for collector side of EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="tagMode for network side of EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
-				<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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="evc object is an optional child object of the Configuration object." />
-				<xml-property name="dependentOn" value="configuration" />
-				<xml-property name="uniqueProps" value="evc-id" />
-				<xml-property name="container" value="evcs" />
-			</xml-properties>
-		</java-type>
+        <java-type name="ForwardingPath">
+            <xml-root-element name="forwarding-path"/>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name"/>
+                <xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
+                <xml-property name="container" value="forwarding-paths"/>
+                <xml-property name="nameProps" value="forwarding-path-name"/>
+                <xml-property name="uniqueProps" value="forwarding-path-id"/>
+                <xml-property name="uriTemplate" value="/network/forwarding-paths/forwarding-path/{forwarding-path-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <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="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the self link for this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v12.Forwarders"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Forwarders">
+            <xml-root-element name="forwarders"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v12.Forwarder"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Forwarder">
+            <xml-root-element name="forwarder"/>
+            <xml-properties>
+                <xml-property name="indexedProps" value="sequence"/>
+                <xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
+                <xml-property name="container" value="forwarders"/>
+                <xml-property name="dependentOn" value="forwarding-path"/>
+                <xml-property name="uriTemplate" value="/forwarders/forwarder/{sequence}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this segmentation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ingress, intermediate, egress"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <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>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwarderEvcs">
+            <xml-root-element name="forwarder-evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v12.ForwarderEvc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwarderEvc">
+            <xml-root-element name="forwarder-evc"/>
+            <java-attributes>
+                <xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for forwarder-evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Internal VLAN."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="SVLAN value for ingress of egress forwarder."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value for ingress of egress forwarder."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="forwarder object is an optional child object of the Configuration object."/>
+                <xml-property name="dependentOn" value="configuration"/>
+                <xml-property name="uniqueProps" value="forwarder-evc-id"/>
+                <xml-property name="container" value="forwarder-evcs"/>
+                <xml-property name="uriTemplate" value="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Evcs">
+            <xml-root-element name="evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v12.Evc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Evc">
+            <xml-root-element name="evc"/>
+            <java-attributes>
+                <xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique/key field for the evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Point-to-Point, Multi-Point"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Commited Information Rate"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diversity Group ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="formerly Performance Group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="EVC Circuit ID of ESP EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Committed Information Rate (For ESP)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units (For ESP)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies ESP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Interconnect type on ingress side of EVC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagode for collector side of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagMode for network side of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
+                <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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="evc object is an optional child object of the Configuration object."/>
+                <xml-property name="dependentOn" value="configuration"/>
+                <xml-property name="uniqueProps" value="evc-id"/>
+                <xml-property name="container" value="evcs"/>
+                <xml-property name="uriTemplate" value="/evcs/evc/{evc-id}"/>
+            </xml-properties>
+        </java-type>
 
-	</java-types>
+    </java-types>
 </xml-bindings>
+
diff --git a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml
index b023261a..08fdb7ad 100644
--- a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml
@@ -20,211 +20,211 @@
   -->
 
 <xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v13" xml-mapping-metadata-complete="true">
-	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.onap.aai.inventory/v13" />
-	</xml-schema>
-	<java-types>
-		<java-type name="Inventory">
-			<xml-root-element name="inventory" />
-			<java-attributes>
-				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v13.Search" />
-				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v13.Actions" />
-				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v13.CloudInfrastructure" />
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v13"/>
+    </xml-schema>
+    <java-types>
+        <java-type name="Inventory">
+            <xml-root-element name="inventory"/>
+            <java-attributes>
+                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v13.Search"/>
+                <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v13.Actions"/>
+                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v13.CloudInfrastructure"/>
 				<xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v13.ExternalSystem" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v13.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v13.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v13.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v13.AaiInternal" />
-				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v13.Nodes"/>
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Nodes">
-			<xml-root-element name="nodes" />
-		</java-type>
-		<java-type name="Search">
-			<xml-root-element name="search" />
-			<java-attributes>
-				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v13.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v13.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v13.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v13.SdnZoneResponse" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="EdgeTagQueryResult">
-			<xml-root-element name="edge-tag-query-result" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v13.TaggedInventoryItemList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="TaggedInventoryItemList">
-			<xml-root-element name="tagged-inventory-item-list" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v13.InventoryItem" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="InventoryItem">
-			<xml-root-element name="inventory-item" />
-			<java-attributes>
-				<xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" />
-				<xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v13.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v13.TaggedInventoryItemList" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="InventoryItemData">
-			<xml-root-element name="inventory-item-data" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v13.Business"/>
+                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v13.ServiceDesignAndCreation"/>
+                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v13.Network"/>
+                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v13.AaiInternal"/>
+                <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v13.Nodes"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Nodes">
+            <xml-root-element name="nodes"/>
+        </java-type>
+        <java-type name="Search">
+            <xml-root-element name="search"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v13.EdgeTagQueryResult"/>
+                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v13.EdgeTagQueryRequest"/>
+                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v13.SearchResults"/>
+                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v13.SdnZoneResponse"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="EdgeTagQueryRequest">
-			<xml-root-element name="edge-tag-query-request" />
-			<java-attributes>
-				<xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" />
-				<xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" />
-				<xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v13.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v13.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v13.SecondaryFilter" />
-			</java-attributes>
-		</java-type>
+        <java-type name="EdgeTagQueryResult">
+            <xml-root-element name="edge-tag-query-result"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v13.TaggedInventoryItemList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="StartNodeFilter">
-			<xml-root-element name="start-node-filter" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+        <java-type name="TaggedInventoryItemList">
+            <xml-root-element name="tagged-inventory-item-list"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v13.InventoryItem"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InventoryItem">
+            <xml-root-element name="inventory-item"/>
+            <java-attributes>
+                <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String"/>
+                <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v13.InventoryItemData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v13.TaggedInventoryItemList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="IncludeNodeFilter">
-			<xml-root-element name="include-node-filter" />
-			<java-attributes>
-				<xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+        <java-type name="InventoryItemData">
+            <xml-root-element name="inventory-item-data"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="EdgeTagQueryRequest">
+            <xml-root-element name="edge-tag-query-request"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String"/>
+                <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String"/>
+                <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v13.StartNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v13.IncludeNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v13.SecondaryFilter"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="SecondaryFilter">
-			<xml-root-element name="secondary-filter" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="filterType" name="filter-type" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+        <java-type name="StartNodeFilter">
+            <xml-root-element name="start-node-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="SearchResults">
-			<xml-root-element name="search-results" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v13.ResultData" />
-			</java-attributes>
-		</java-type>
+        <java-type name="IncludeNodeFilter">
+            <xml-root-element name="include-node-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SecondaryFilter">
+            <xml-root-element name="secondary-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ResultData">
-			<xml-root-element name="result-data" />
-			<java-attributes>
-				<xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The specific type of node in the A&amp;AI graph" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The URL to the specific resource" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
+        <java-type name="SearchResults">
+            <xml-root-element name="search-results"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v13.ResultData"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="SdnZoneResponse">
-			<xml-root-element name="sdn-zone-response" />
-			<java-attributes>
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v13.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v13.AzAndDvsSwitches" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ResultData">
+            <xml-root-element name="result-data"/>
+            <java-attributes>
+                <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The specific type of node in the A&amp;AI graph"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The URL to the specific resource"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="AzAndDvsSwitches">
-			<xml-root-element name="az-and-dvs-switches" />
-			<java-attributes>
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v13.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v13.AvailabilityZone" />
-			</java-attributes>
-		</java-type>
+        <java-type name="SdnZoneResponse">
+            <xml-root-element name="sdn-zone-response"/>
+            <java-attributes>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v13.OamNetworks"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v13.AzAndDvsSwitches"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Actions">
-			<xml-properties>
-				<xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)." />
-			</xml-properties>
-			<xml-root-element name="actions" />
-			<java-attributes>
-				<xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v13.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v13.Notify" />
-			</java-attributes>
-		</java-type>
+        <java-type name="AzAndDvsSwitches">
+            <xml-root-element name="az-and-dvs-switches"/>
+            <java-attributes>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v13.DvsSwitches"/>
+                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v13.AvailabilityZone"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Update">
-			<xml-properties>
-				<xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team." />
-			</xml-properties>
-			<xml-root-element name="update" />
-			<java-attributes>
-				<xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v13.UpdateNodeKey" />
-				<xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v13.Action" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Actions">
+            <xml-properties>
+                <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)."/>
+            </xml-properties>
+            <xml-root-element name="actions"/>
+            <java-attributes>
+                <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v13.Update"/>
+                <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v13.Notify"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Action">
-			<xml-root-element name="action" />
-			<java-attributes>
-				<xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v13.ActionData" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Update">
+            <xml-properties>
+                <xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team."/>
+            </xml-properties>
+            <xml-root-element name="update"/>
+            <java-attributes>
+                <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v13.UpdateNodeKey"/>
+                <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v13.Action"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ActionData">
-			<xml-root-element name="action-data" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Action">
+            <xml-root-element name="action"/>
+            <java-attributes>
+                <xml-element java-attribute="actionType" name="action-type" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v13.ActionData"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="UpdateNodeKey">
-			<xml-root-element name="update-node-key" />
-			<java-attributes>
-				<xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
-				<xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ActionData">
+            <xml-root-element name="action-data"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Notify">
-			<xml-root-element name="notify" />
-			<java-attributes>
-				<xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" />
-				<xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" />
-				<xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v13.KeyData" />
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+        <java-type name="UpdateNodeKey">
+            <xml-root-element name="update-node-key"/>
+            <java-attributes>
+                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Notify">
+            <xml-root-element name="notify"/>
+            <java-attributes>
+                <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String"/>
+                <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v13.KeyData"/>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="KeyData">
-			<xml-root-element name="key-data" />
-			<java-attributes>
-				<xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
-				<xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+        <java-type name="KeyData">
+            <xml-root-element name="key-data"/>
+            <java-attributes>
+                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
                <java-type name="ExternalSystem">
                        <xml-properties>
@@ -566,80 +566,79 @@
 			</xml-properties>
 		</java-type>
 
-		<java-type name="CloudInfrastructure">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for cloud infrastructure." />
-			</xml-properties>
-			<xml-root-element name="cloud-infrastructure" />
-			<java-attributes>
-				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v13.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v13.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v13.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v13.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v13.VirtualDataCenters" />
-				<xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v13.OperationalEnvironments" />
-			</java-attributes>
-		</java-type>
+        <java-type name="CloudInfrastructure">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for cloud infrastructure."/>
+            </xml-properties>
+            <xml-root-element name="cloud-infrastructure"/>
+            <java-attributes>
+                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v13.Complexes"/>
+                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v13.CloudRegions"/>
+                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v13.NetworkProfiles"/>
+                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v13.Pservers"/>
+                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v13.VirtualDataCenters"/>
+                <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v13.OperationalEnvironments"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="CloudRegions">
-			<xml-root-element name="cloud-regions" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v13.CloudRegion" />
-			</java-attributes>
+        <java-type name="CloudRegions">
+            <xml-root-element name="cloud-regions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v13.CloudRegion"/>
+            </java-attributes>
             <xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="CloudRegion">
-			<xml-root-element name="cloud-region" />
-			<java-attributes>
-				<xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
+        <java-type name="CloudRegion">
+            <xml-root-element name="cloud-region"/>
+            <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-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the cloud (e.g., openstack)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL of the keystone identity service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." />
-					</xml-properties>
-				</xml-element>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the cloud (e.g., openstack)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation."/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." />
@@ -650,23 +649,23 @@
 						<xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." />
 					</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="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v13.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v13.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v13.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v13.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v13.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v13.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v13.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v13.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v13.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v13.VipIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v13.VipIpv6AddressList" />
+                <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="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v13.VolumeGroups"/>
+                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v13.Tenants"/>
+                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v13.Flavors"/>
+                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v13.GroupAssignments"/>
+                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v13.Snapshots"/>
+                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v13.Images"/>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v13.DvsSwitches"/>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v13.OamNetworks"/>
+                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v13.AvailabilityZones"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v13.VipIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v13.VipIpv6AddressList"/>
 				<xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v13.HpaCapabilities">
 					<xml-properties>
 						<xml-property name="description" value="List of cloud-region specific HPA Capabilities"/>
@@ -674,2020 +673,2046 @@
 				</xml-element>
 				<xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v13.EsrSystemInfoList" />
             </java-attributes>
-			<xml-properties>
+            <xml-properties>
 				<xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." />
-				<xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" />
-				<xml-property name="nameProps" value="owner-defined-type" />
-				<xml-property name="container" value="cloud-regions" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-		<java-type name="VolumeGroups">
-			<xml-properties>
-				<xml-property name="description" value="Collection of persistent block-level storage." />
-			</xml-properties>
-			<xml-root-element name="volume-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v13.VolumeGroup" />
-			</java-attributes>
-		</java-type>
+                <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="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="VolumeGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of persistent block-level storage."/>
+            </xml-properties>
+            <xml-root-element name="volume-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v13.VolumeGroup"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VolumeGroup">
-			<xml-root-element name="volume-group" />
-			<java-attributes>
-				<xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of volume-group." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the volume group." />
-					</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 volume-group" />
-					</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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this volume-group" />
-					</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="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-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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Persistent block-level storage." />
-				<xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" />
-				<xml-property name="searchable" value="volume-group-id,volume-group-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="volume-groups" />
-			</xml-properties>
-		</java-type>
+        <java-type name="VolumeGroup">
+            <xml-root-element name="volume-group"/>
+            <java-attributes>
+                <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of volume-group."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumeGroupName" name="volume-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the volume group."/>
+                    </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 volume-group"/>
+                    </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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this volume-group"/>
+                    </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="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-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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Persistent block-level storage."/>
+                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id"/>
+                <xml-property name="searchable" value="volume-group-id,volume-group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="volume-groups"/>
+                <xml-property name="uriTemplate" value="/volume-groups/volume-group/{volume-group-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="RelationshipList">
-			<xml-root-element name="relationship-list" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v13.Relationship" />
-			</java-attributes>
-		</java-type>
+        <java-type name="RelationshipList">
+            <xml-root-element name="relationship-list"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v13.Relationship"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Relationship">
-			<xml-root-element name="relationship" />
-			<java-attributes>
-				<xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The edge label for this relationship." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to the object in A&amp;AI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v13.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v13.RelatedToProperty" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Relationship">
+            <xml-root-element name="relationship"/>
+            <java-attributes>
+                <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The edge label for this relationship."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to the object in A&amp;AI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v13.RelationshipData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v13.RelatedToProperty"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="RelatedToProperty">
-			<xml-root-element name="related-to-property" />
-			<java-attributes>
-				<xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Key part of a key/value pair" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Value part of a key/value pair" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
+        <java-type name="RelatedToProperty">
+            <xml-root-element name="related-to-property"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Key part of a key/value pair"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Value part of a key/value pair"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="RelationshipData">
-			<xml-root-element name="relationship-data" />
-			<java-attributes>
-				<xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Value of the attribute." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
+        <java-type name="RelationshipData">
+            <xml-root-element name="relationship-data"/>
+            <java-attributes>
+                <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Value of the attribute."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Complexes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-			</xml-properties>
-			<xml-root-element name="complexes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v13.Complex" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Complexes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+            </xml-properties>
+            <xml-root-element name="complexes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v13.Complex"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Complex">
-			<xml-root-element name="complex" />
-			<java-attributes>
-				<xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Data center code which can be an alternate way to identify a complex" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Gamma complex name for LCP instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL of the keystone identity service" />
-					</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="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type, e.g., central office, data center." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" />
-				<xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-				<xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-				<xml-element java-attribute="state" name="state" type="java.lang.String" />
-				<xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-				<xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-				<xml-element java-attribute="region" name="region" required="true" type="java.lang.String" />
-				<xml-element java-attribute="latitude" name="latitude" type="java.lang.String" />
-				<xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
-				<xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
-				<xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-				<xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v13.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-				<xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id" />
-				<xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code" />
-				<xml-property name="uniqueProps" value="physical-location-id" />
-				<xml-property name="container" value="complexes" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Complex">
+            <xml-root-element name="complex"/>
+            <java-attributes>
+                <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gamma complex name for LCP instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
+                    </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="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type, e.g., central office, data center."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="street2" name="street2" type="java.lang.String"/>
+                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="state" name="state" type="java.lang.String"/>
+                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"/>
+                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"/>
+                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"/>
+                <xml-element java-attribute="lata" name="lata" type="java.lang.String"/>
+                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v13.CtagPools"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id"/>
+                <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code"/>
+                <xml-property name="uniqueProps" value="physical-location-id"/>
+                <xml-property name="container" value="complexes"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/complexes/complex/{physical-location-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="CtagPools">
-			<xml-root-element name="ctag-pools" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v13.CtagPool" />
-			</java-attributes>
-		</java-type>
+        <java-type name="CtagPools">
+            <xml-root-element name="ctag-pools"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v13.CtagPool"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="CtagPool">
-			<xml-root-element name="ctag-pool" />
-			<java-attributes>
-				<xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="The Target provider edge router" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the availability zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Describes what the intended purpose of this pool is." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Comma separated list of ctags" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
-				<xml-property name="indexedProps" value="availability-zone-name" />
-				<xml-property name="dependentOn" value="complex" />
-				<xml-property name="container" value="ctag-pools" />
-			</xml-properties>
-		</java-type>
+        <java-type name="CtagPool">
+            <xml-root-element name="ctag-pool"/>
+            <java-attributes>
+                <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="The Target provider edge router"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the availability zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes what the intended purpose of this pool is."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Comma separated list of ctags"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose."/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="ctag-pools"/>
+                <xml-property name="uriTemplate" value="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Tenants">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack tenants." />
-			</xml-properties>
-			<xml-root-element name="tenants" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v13.Tenant" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Tenants">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack tenants."/>
+            </xml-properties>
+            <xml-root-element name="tenants"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v13.Tenant"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Tenant">
-			<xml-root-element name="tenant" />
-			<java-attributes>
-				<xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id relative to the cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Readable name of tenant" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the tenant context." />
-					</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="vservers" name="vservers" type="inventory.aai.onap.org.v13.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack tenant" />
-				<xml-property name="nameProps" value="tenant-name" />
-				<xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context" />
-				<xml-property name="searchable" value="tenant-id,tenant-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="tenants" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Tenant">
+            <xml-root-element name="tenant"/>
+            <java-attributes>
+                <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id relative to the cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Readable name of tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the tenant context."/>
+                    </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="vservers" name="vservers" type="inventory.aai.onap.org.v13.Vservers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack tenant"/>
+                <xml-property name="nameProps" value="tenant-name"/>
+                <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context"/>
+                <xml-property name="searchable" value="tenant-id,tenant-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="tenants"/>
+                <xml-property name="uriTemplate" value="/tenants/tenant/{tenant-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vservers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." />
-			</xml-properties>
-			<xml-root-element name="vservers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v13.Vserver" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Vservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs."/>
+            </xml-properties>
+            <xml-root-element name="vservers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v13.Vserver"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Vserver">
-			<xml-root-element name="vserver" />
-			<java-attributes>
-				<xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier for this vserver relative to its tenant" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of vserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternative name of vserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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="volumes" name="volumes" type="inventory.aai.onap.org.v13.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
-				<xml-property name="nameProps" value="vserver-name" />
-				<xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" />
-				<xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2" />
-				<xml-property name="dependentOn" value="tenant" />
-				<xml-property name="container" value="vservers" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vserver">
+            <xml-root-element name="vserver"/>
+            <java-attributes>
+                <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternative name of vserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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). 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" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="volumes" name="volumes" type="inventory.aai.onap.org.v13.Volumes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
+                <xml-property name="nameProps" value="vserver-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2"/>
+                <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="container" value="vservers"/>
+                <xml-property name="uriTemplate" value="/vservers/vserver/{vserver-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="LInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of logical interfaces." />
-			</xml-properties>
-			<xml-root-element name="l-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v13.LInterface" />
-			</java-attributes>
-		</java-type>
+        <java-type name="LInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="l-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v13.LInterface"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="LInterface">
-			<xml-root-element name="l-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name given to the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="MAC address for the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<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 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 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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block." />
-					</xml-properties>
-				</xml-element>				
-				<xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v13.Vlans" />
-				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v13.SriovVfs" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Logical interfaces, e.g., a vnic." />
-				<xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
-				<xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
-				<xml-property name="container" value="l-interfaces" />
-			</xml-properties>
-		</java-type>
+        <java-type name="LInterface">
+            <xml-root-element name="l-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name given to the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="MAC address for the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <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 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 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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v13.Vlans"/>
+                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v13.SriovVfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
+                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name"/>
+                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface"/>
+                <xml-property name="container" value="l-interfaces"/>
+                <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="SriovVfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of SR-IOV Virtual Functions." />
-			</xml-properties>
-			<xml-root-element name="sriov-vfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v13.SriovVf" />
-			</java-attributes>
-		</java-type>
-		<java-type name="SriovVf">
-			<xml-root-element name="sriov-vf" />
-			<java-attributes>
-				<xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="PCI ID used to identify the sriov-vf" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto." />
-					</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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
-				<xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" />
-				<xml-property name="dependentOn" value="l-interface" />
-				<xml-property name="container" value="sriov-vfs" />
-			</xml-properties>
-		</java-type>
+        <java-type name="SriovVfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Virtual Functions."/>
+            </xml-properties>
+            <xml-root-element name="sriov-vfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v13.SriovVf"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovVf">
+            <xml-root-element name="sriov-vf"/>
+            <java-attributes>
+                <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="PCI ID used to identify the sriov-vf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
+                    </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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
+                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="sriov-vfs"/>
+                <xml-property name="uriTemplate" value="/sriov-vfs/sriov-vf/{pci-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="L3InterfaceIpv4AddressList">
-			<xml-root-element name="l3-interface-ipv4-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 32 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv4 Address Range" />
-				<xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
-			</xml-properties>
-		</java-type>
+        <java-type name="L3InterfaceIpv4AddressList">
+            <xml-root-element name="l3-interface-ipv4-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc"/>
+            <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vlans">
-			<xml-root-element name="vlans" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v13.Vlan" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Vlans">
+            <xml-root-element name="vlans"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v13.Vlan"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Vlan">
-			<xml-root-element name="vlan" />
-			<java-attributes>
-				<xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="String that identifies the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</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="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to describe (the service associated with) the vlan" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
-					<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 java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
-					</xml-properties>
-				</xml-element>			
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key" />
-				<xml-property name="dependentOn" value="l-interface" />
-				<xml-property name="container" value="vlans" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vlan">
+            <xml-root-element name="vlan"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="String that identifies the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </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="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to describe (the service associated with) the vlan"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
+                    <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 java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of vlan"/>
+                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="vlans"/>
+                <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="L3InterfaceIpv6AddressList">
-			<xml-root-element name="l3-interface-ipv6-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 128 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv6 Address Range" />
-				<xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
-			</xml-properties>
-		</java-type>
+        <java-type name="L3InterfaceIpv6AddressList">
+            <xml-root-element name="l3-interface-ipv6-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc"/>
+            <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Volumes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of ephemeral Block storage volumes." />
-			</xml-properties>
-			<xml-root-element name="volumes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v13.Volume" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Volumes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of ephemeral Block storage volumes."/>
+            </xml-properties>
+            <xml-root-element name="volumes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v13.Volume"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Volume">
-			<xml-root-element name="volume" />
-			<java-attributes>
-				<xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of block storage volume relative to the vserver." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Ephemeral Block storage volume." />
-				<xml-property name="indexedProps" value="volume-id" />
-				<xml-property name="dependentOn" value="vserver" />
-				<xml-property name="container" value="volumes" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Volume">
+            <xml-root-element name="volume"/>
+            <java-attributes>
+                <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Ephemeral Block storage volume."/>
+                <xml-property name="indexedProps" value="volume-id"/>
+                <xml-property name="dependentOn" value="vserver"/>
+                <xml-property name="container" value="volumes"/>
+                <xml-property name="uriTemplate" value="/volumes/volume/{volume-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Flavors">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack flavors." />
-			</xml-properties>
-			<xml-root-element name="flavors" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v13.Flavor" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Flavors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack flavors."/>
+            </xml-properties>
+            <xml-root-element name="flavors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v13.Flavor"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Flavor">
-			<xml-root-element name="flavor" />
-			<java-attributes>
-				<xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Flavor id, expected to be unique across cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Cloud Region Flavor name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Number of CPUs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Amount of memory" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Disk space" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Amount of ephemeral disk space" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="amount of swap space allocation" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" />
-					</xml-properties>
-				</xml-element>
+        <java-type name="Flavor">
+            <xml-root-element name="flavor"/>
+            <java-attributes>
+                <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Flavor name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of CPUs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Amount of memory"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Disk space"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Amount of ephemeral disk space"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="amount of swap space allocation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled"/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v13.HpaCapabilities">
 					<xml-properties>
 						<xml-property name="description" value="List of flavor specific HPA Capabilities"/>
 					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack flavor." />
-				<xml-property name="nameProps" value="flavor-name" />
-				<xml-property name="indexedProps" value="flavor-name,flavor-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<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-properties>
-			<xml-root-element name="snapshots" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v13.Snapshot" />
-			</java-attributes>		
-		</java-type>
-		
-		<java-type name="Snapshot">
-			<xml-root-element name="snapshot" />
-			<java-attributes>
-				<xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Snapshot name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operating system architecture" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The common name of the operating system distribution in lowercase" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The operating system version as specified by the distributor." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack snapshot" />
-				<xml-property name="nameProps" value="snapshot-name" />
-				<xml-property name="uniqueProps" value="snapshot-id" />
-				<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>	
-		</java-type>
-		
-		<java-type name="GroupAssignments">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack group assignments" />
-			</xml-properties>
-			<xml-root-element name="group-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v13.GroupAssignment" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="GroupAssignment">
-			<xml-root-element name="group-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Group id, expected to be unique across cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group type - the type of group this instance refers to" />
-					</xml-properties>
-				</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-element>
-				<xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group description - description of the group" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
-				<xml-property name="nameProps" value="group-name" />
-				<xml-property name="indexedProps" value="group-id,group-type,group-name" />
-				<xml-property name="searchable" value="group-id,group-name"/>
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="group-assignments" />
-			</xml-properties>
-		</java-type>			
+                <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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack flavor."/>
+                <xml-property name="nameProps" value="flavor-name"/>
+                <xml-property name="indexedProps" value="flavor-name,flavor-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="flavors"/>
+                <xml-property name="uriTemplate" value="/flavors/flavor/{flavor-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Images">
-			<xml-properties>
-				<xml-property name="description" value="Collectio of Openstack images." />
-			</xml-properties>
-			<xml-root-element name="images" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v13.Image" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Snapshots">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack snapshots"/>
+            </xml-properties>
+            <xml-root-element name="snapshots"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v13.Snapshot"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Image">
-			<xml-root-element name="image" />
-			<java-attributes>
-				<xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Image id, expected to be unique across cloud region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Image name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operating system architecture." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The common name of the operating system distribution in lowercase" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The operating system version as specified by the distributor." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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.v13.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack image." />
-				<xml-property name="nameProps" value="image-name" />
-				<xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="images" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Snapshot">
+            <xml-root-element name="snapshot"/>
+            <java-attributes>
+                <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Snapshot name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system architecture"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack snapshot"/>
+                <xml-property name="nameProps" value="snapshot-name"/>
+                <xml-property name="uniqueProps" value="snapshot-id"/>
+                <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-property name="uriTemplate" value="/snapshots/snapshot/{snapshot-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Metadata">
-			<xml-properties>
-				<xml-property name="description" value="Collection of metadatum (key/value pairs)" />
-			</xml-properties>
-			<xml-root-element name="metadata" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v13.Metadatum" />
-			</java-attributes>
-		</java-type>
+        <java-type name="GroupAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack group assignments"/>
+            </xml-properties>
+            <xml-root-element name="group-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v13.GroupAssignment"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Metadatum">
-			<xml-root-element name="metadatum" />
-			<java-attributes>
-				<xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="metaval" name="metaval" required="true" 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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Key/value pairs" />
-				<xml-property name="indexedProps" value="metaname" />
-				<xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" />
-				<xml-property name="container" value="metadata" />
-			</xml-properties>
-		</java-type>
+        <java-type name="GroupAssignment">
+            <xml-root-element name="group-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Group id, expected to be unique across cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group type - the type of group this instance refers to"/>
+                    </xml-properties>
+                </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-element>
+                <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group description - description of the group"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)."/>
+                <xml-property name="nameProps" value="group-name"/>
+                <xml-property name="indexedProps" value="group-id,group-type,group-name"/>
+                <xml-property name="searchable" value="group-id,group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="group-assignments"/>
+                <xml-property name="uriTemplate" value="/group-assignments/group-assignment/{group-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="DvsSwitches">
-			<xml-properties>
-				<xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." />
-			</xml-properties>
-			<xml-root-element name="dvs-switches" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v13.DvsSwitch" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Images">
+            <xml-properties>
+                <xml-property name="description" value="Collectio of Openstack images."/>
+            </xml-properties>
+            <xml-root-element name="images"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v13.Image"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="DvsSwitch">
-			<xml-root-element name="dvs-switch" />
-			<java-attributes>
-				<xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="DVS switch name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL used to reach the vcenter" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
-				<xml-property name="indexedProps" value="vcenter-url,switch-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="dvs-switches" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Image">
+            <xml-root-element name="image"/>
+            <java-attributes>
+                <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Image id, expected to be unique across cloud region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Image name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system architecture."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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.v13.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack image."/>
+                <xml-property name="nameProps" value="image-name"/>
+                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="images"/>
+                <xml-property name="uriTemplate" value="/images/image/{image-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="NetworkProfiles">
-			<xml-properties>
-				<xml-property name="description" value="Collection of network profiles" />
-			</xml-properties>
-			<xml-root-element name="network-profiles" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v13.NetworkProfile" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Metadata">
+            <xml-properties>
+                <xml-property name="description" value="Collection of metadatum (key/value pairs)"/>
+            </xml-properties>
+            <xml-root-element name="metadata"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v13.Metadatum"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Metadatum">
+            <xml-root-element name="metadatum"/>
+            <java-attributes>
+                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="metaval" name="metaval" required="true" 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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Key/value pairs"/>
+                <xml-property name="indexedProps" value="metaname"/>
+                <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model"/>
+                <xml-property name="container" value="metadata"/>
+                <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="NetworkProfile">
-			<xml-root-element name="network-profile" />
-			<java-attributes>
-				<xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique name of network profile." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encrypted SNMP community string" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
-				<xml-property name="indexedProps" value="nm-profile-name" />
-				<xml-property name="container" value="network-profiles" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="DvsSwitches">
+            <xml-properties>
+                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs."/>
+            </xml-properties>
+            <xml-root-element name="dvs-switches"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v13.DvsSwitch"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Pservers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of compute hosts." />
-			</xml-properties>
-			<xml-root-element name="pservers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v13.Pserver" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="DvsSwitch">
+            <xml-root-element name="dvs-switch"/>
+            <java-attributes>
+                <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS switch name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL used to reach the vcenter"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
+                <xml-property name="indexedProps" value="vcenter-url,switch-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="dvs-switches"/>
+                <xml-property name="uriTemplate" value="/dvs-switches/dvs-switch/{switch-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Pserver">
-			<xml-root-element name="pserver" />
-			<java-attributes>
-				<xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Value from executing hostname on the compute node." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="PTNII name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Number of cpus" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Disk size, in GBs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="RAM size, in MBs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Fully-qualified domain name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Serial number, may be queried" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 OAM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of Pserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="internet topology of Pserver" />
-					</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 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="pserverName2" name="pserver-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="alternative pserver name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="purpose of pserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates who owns and or manages the device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The host profile that defines the configuration of the pserver." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
-				<xml-property name="nameProps" value="pserver-name2" />
-				<xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status" />
-				<xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" />
-				<xml-property name="container" value="pservers" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="NetworkProfiles">
+            <xml-properties>
+                <xml-property name="description" value="Collection of network profiles"/>
+            </xml-properties>
+            <xml-root-element name="network-profiles"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v13.NetworkProfile"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="PInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical interfaces." />
-			</xml-properties>
-			<xml-root-element name="p-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v13.PInterface" />
-			</java-attributes>
-		</java-type>
+        <java-type name="NetworkProfile">
+            <xml-root-element name="network-profile"/>
+            <java-attributes>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique name of network profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted SNMP community string"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Network profile populated by SDN-GP for SNMP"/>
+                <xml-property name="indexedProps" value="nm-profile-name"/>
+                <xml-property name="container" value="network-profiles"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="PInterface">
-			<xml-root-element name="p-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name that identifies the physical interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Nature of the services and connectivity on this port." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CLEI or other specification for p-interface hardware." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role specification for p-interface hardware." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the physical properties of the interface." />
-					</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>
+        <java-type name="Pservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of compute hosts."/>
+            </xml-properties>
+            <xml-root-element name="pservers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v13.Pserver"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pserver">
+            <xml-root-element name="pserver"/>
+            <java-attributes>
+                <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value from executing hostname on the compute node."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="PTNII name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of cpus"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Disk size, in GBs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="RAM size, in MBs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Fully-qualified domain name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number, may be queried"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of Pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="internet topology of Pserver"/>
+                    </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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </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="pserverName2" name="pserver-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="alternative pserver name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="purpose of pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates who owns and or manages the device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The host profile that defines the configuration of the pserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
+                <xml-property name="nameProps" value="pserver-name2"/>
+                <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status"/>
+                <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address"/>
+                <xml-property name="uniqueProps" value="hostname"/>
+                <xml-property name="container" value="pservers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/pservers/pserver/{hostname}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="p-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v13.PInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PInterface">
+            <xml-root-element name="p-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the physical interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nature of the services and connectivity on this port."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role specification for p-interface hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
+                    </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="macAddress" name="mac-addresss" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="MAC Address of the p-interface." />
 					</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="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="inventory status" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v13.SriovPfs" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Physical interface (e.g., nic)" />
-				<xml-property name="indexedProps" value="interface-name,prov-status" />
-				<xml-property name="nameProps" value="prov-status" />
-				<xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
-				<xml-property name="container" value="p-interfaces" />
-			</xml-properties>
-		</java-type>
+                <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="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="inventory status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v13.SriovPfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Physical interface (e.g., nic)"/>
+                <xml-property name="indexedProps" value="interface-name,prov-status"/>
+                <xml-property name="nameProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
+                <xml-property name="container" value="p-interfaces"/>
+                <xml-property name="uriTemplate" value="/p-interfaces/p-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="LagInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of link aggregate interfaces." />
-			</xml-properties>
-			<xml-root-element name="lag-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v13.LagInterface" />
-			</java-attributes>
-		</java-type>
+        <java-type name="LagInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregate interfaces."/>
+            </xml-properties>
+            <xml-root-element name="lag-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v13.LagInterface"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="LagInterface">
-			<xml-root-element name="lag-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name that identifies the link aggregate interface" />
-					</xml-properties>
-				</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 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="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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 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.v13.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Link aggregate interface" />
-				<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>
+        <java-type name="LagInterface">
+            <xml-root-element name="lag-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the link aggregate interface"/>
+                    </xml-properties>
+                </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 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="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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 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.v13.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Link aggregate interface"/>
+                <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-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="OamNetworks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. " />
-			</xml-properties>
-			<xml-root-element name="oam-networks" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v13.OamNetwork" />
-			</java-attributes>
-		</java-type>
+        <java-type name="OamNetworks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. "/>
+            </xml-properties>
+            <xml-root-element name="oam-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v13.OamNetwork"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="OamNetwork">
-			<xml-root-element name="oam-network" />
-			<java-attributes>
-				<xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of the network. Unique across a cloud-region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="cvlan-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
-				<xml-property name="nameProps" value="network-name" />
-				<xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="oam-networks" />
-			</xml-properties>
-		</java-type>
+        <java-type name="OamNetwork">
+            <xml-root-element name="oam-network"/>
+            <java-attributes>
+                <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="cvlan-id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="oam-networks"/>
+                <xml-property name="uriTemplate" value="/oam-networks/oam-network/{network-uuid}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="AvailabilityZones">
-			<xml-properties>
-				<xml-property name="description" value="Collection of availability zones" />
-			</xml-properties>
-			<xml-root-element name="availability-zones" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v13.AvailabilityZone" />
-			</java-attributes>
-		</java-type>
+        <java-type name="AvailabilityZones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of availability zones"/>
+            </xml-properties>
+            <xml-root-element name="availability-zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v13.AvailabilityZone"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="AvailabilityZone">
-			<xml-root-element name="availability-zone" />
-			<java-attributes>
-				<xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the availability zone.  Unique across a cloud region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
-				<xml-property name="indexedProps" value="availability-zone-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="availability-zones" />
-			</xml-properties>
-		</java-type>
+        <java-type name="AvailabilityZone">
+            <xml-root-element name="availability-zone"/>
+            <java-attributes>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers"/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="availability-zones"/>
+                <xml-property name="uriTemplate" value="/availability-zones/availability-zone/{availability-zone-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VirtualDataCenters">
-			<xml-properties>
-				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-			</xml-properties>
-			<xml-root-element name="virtual-data-centers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v13.VirtualDataCenter" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VirtualDataCenters">
+            <xml-properties>
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+            </xml-properties>
+            <xml-root-element name="virtual-data-centers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v13.VirtualDataCenter"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VirtualDataCenter">
-			<xml-root-element name="virtual-data-center" />
-			<java-attributes>
-				<xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of the vdc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the virtual data center" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-				<xml-property name="nameProps" value="vdc-name" />
-				<xml-property name="indexedProps" value="vdc-name,vdc-id" />
-				<xml-property name="container" value="virtual-data-centers" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="VirtualDataCenter">
+            <xml-root-element name="virtual-data-center"/>
+            <java-attributes>
+                <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the vdc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the virtual data center"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+                <xml-property name="nameProps" value="vdc-name"/>
+                <xml-property name="indexedProps" value="vdc-name,vdc-id"/>
+                <xml-property name="container" value="virtual-data-centers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Business">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for business related constructs" />
-			</xml-properties>
-			<xml-root-element name="business" />
-			<java-attributes>
-				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v13.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v13.Customers" />
-				<xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v13.LinesOfBusiness" />
-				<xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v13.OwningEntities" />
-				<xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v13.Platforms" />
-				<xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v13.Projects" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Business">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for business related constructs"/>
+            </xml-properties>
+            <xml-root-element name="business"/>
+            <java-attributes>
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v13.Connectors"/>
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v13.Customers"/>
+                <xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v13.LinesOfBusiness"/>
+                <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v13.OwningEntities"/>
+                <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v13.Platforms"/>
+                <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v13.Projects"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Projects">
-			<xml-properties>
-				<xml-property name="description" value="Collection of projects" />
-			</xml-properties>
-			<xml-root-element name="projects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v13.Project" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Projects">
+            <xml-properties>
+                <xml-property name="description" value="Collection of projects"/>
+            </xml-properties>
+            <xml-root-element name="projects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v13.Project"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Project">
-			<xml-root-element name="project" />
-			<java-attributes>
-				<xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the project deploying a service" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes the project" />
-				<xml-property name="indexedProps" value="project-name" />
-				<xml-property name="uniqueProps" value="project-name" />
-				<xml-property name="container" value="projects" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Project">
+            <xml-root-element name="project"/>
+            <java-attributes>
+                <xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the project deploying a service"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes the project"/>
+                <xml-property name="indexedProps" value="project-name"/>
+                <xml-property name="uniqueProps" value="project-name"/>
+                <xml-property name="container" value="projects"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/projects/project/{project-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Connectors">
-			<xml-properties>
-				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
-			</xml-properties>
-			<xml-root-element name="connectors" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v13.Connector" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Connectors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
+            </xml-properties>
+            <xml-root-element name="connectors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v13.Connector"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Connector">
-			<xml-root-element name="connector" />
-			<java-attributes>
-				<xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of resource instance." />
-					</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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
-			</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,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>
-		</java-type>
+        <java-type name="Connector">
+            <xml-root-element name="connector"/>
+            <java-attributes>
+                <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of resource instance."/>
+                    </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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata"/>
+            </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,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-property name="uriTemplate" value="/business/connectors/connector/{resource-instance-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Customers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." />
-			</xml-properties>
-			<xml-root-element name="customers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v13.Customer" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Customers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
+            </xml-properties>
+            <xml-root-element name="customers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v13.Customer"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Customer">
-			<xml-root-element name="customer" />
-			<java-attributes>
-				<xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." />
-						<xml-property name="defaultValue" value="CUST" />
-					</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="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v13.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
-				<xml-property name="nameProps" value="subscriber-name" />
-				<xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
-				<xml-property name="searchable" value="global-customer-id,subscriber-name" />
-				<xml-property name="uniqueProps" value="global-customer-id" />
-				<xml-property name="container" value="customers" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="LinesOfBusiness">
-			<xml-properties>
-				<xml-property name="description" value="Collection of lines-of-business" />
-			</xml-properties>
-			<xml-root-element name="lines-of-business" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v13.LineOfBusiness" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="LineOfBusiness">
-			<xml-root-element name="line-of-business" />
-			<java-attributes>
-				<xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the line-of-business (product)" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes a line-of-business" />
-				<xml-property name="indexedProps" value="line-of-business-name" />
-				<xml-property name="uniqueProps" value="line-of-business-name" />
-				<xml-property name="container" value="lines-of-business" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="OwningEntities">
-			<xml-properties>
-				<xml-property name="description" value="Collection of owning-entities" />
-			</xml-properties>
-			<xml-root-element name="owning-entities" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v13.OwningEntity" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="OwningEntity">
-			<xml-root-element name="owning-entity" />
-			<java-attributes>
-				<xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of an owning entity" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Owning entity name" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes an owning-entity" />
-				<xml-property name="indexedProps" value="owning-entity-id, owning-entity-name" />
-				<xml-property name="searchable" value="owning-entity-id" />
-				<xml-property name="uniqueProps" value="owning-entity-id, owning-entity-name" />
-				<xml-property name="container" value="owning-entities" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="Platforms">
-			<xml-properties>
-				<xml-property name="description" value="Collection of platforms" />
-			</xml-properties>
-			<xml-root-element name="platforms" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v13.Platform" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="Platform">
-			<xml-root-element name="platform" />
-			<java-attributes>
-				<xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the platform" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes a platform" />
-				<xml-property name="indexedProps" value="platform-name" />
-				<xml-property name="uniqueProps" value="platform-name" />
-				<xml-property name="container" value="platforms" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="ServiceSubscriptions">
-			<xml-properties>
-				<xml-property name="description" value="Collection of objects that group service instances." />
-			</xml-properties>
-			<xml-root-element name="service-subscriptions" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v13.ServiceSubscription" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Customer">
+            <xml-root-element name="customer"/>
+            <java-attributes>
+                <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers."/>
+                        <xml-property name="defaultValue" value="CUST"/>
+                    </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="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v13.ServiceSubscriptions"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
+                <xml-property name="nameProps" value="subscriber-name"/>
+                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type"/>
+                <xml-property name="searchable" value="global-customer-id,subscriber-name"/>
+                <xml-property name="uniqueProps" value="global-customer-id"/>
+                <xml-property name="container" value="customers"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/customers/customer/{global-customer-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceSubscription">
-			<xml-root-element name="service-subscription" />
-			<java-attributes>
-				<xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+        <java-type name="LinesOfBusiness">
+            <xml-properties>
+                <xml-property name="description" value="Collection of lines-of-business"/>
+            </xml-properties>
+            <xml-root-element name="lines-of-business"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v13.LineOfBusiness"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LineOfBusiness">
+            <xml-root-element name="line-of-business"/>
+            <java-attributes>
+                <xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution." />
+                        <xml-property name="description" value="Name of the line-of-business (product)"/>
                     </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="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v13.ServiceInstances">
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Object that group service instances." />
-				<xml-property name="indexedProps" value="service-type" />
-				<xml-property name="dependentOn" value="customer" />
-				<xml-property name="container" value="service-subscriptions" />
-				<xml-property name="crossEntityReference" value="service-instance,service-type" />
-			</xml-properties>
-		</java-type>
+                <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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a line-of-business"/>
+                <xml-property name="indexedProps" value="line-of-business-name"/>
+                <xml-property name="uniqueProps" value="line-of-business-name"/>
+                <xml-property name="container" value="lines-of-business"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/lines-of-business/line-of-business/{line-of-business-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceInstances">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service instances" />
-			</xml-properties>
-			<xml-root-element name="service-instances" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v13.ServiceInstance" />
-			</java-attributes>
-		</java-type>
+        <java-type name="OwningEntities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of owning-entities"/>
+            </xml-properties>
+            <xml-root-element name="owning-entities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v13.OwningEntity"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ServiceInstance">
-			<xml-root-element name="service-instance" />
-			<java-attributes>
-				<xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this instance of a service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
-					<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="serviceType" name="service-type" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="String capturing type of service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="String capturing the service role." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the environment context assigned to the service-instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the workload context assigned to the service-instance." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="OwningEntity">
+            <xml-root-element name="owning-entity"/>
+            <java-attributes>
+                <xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an owning entity"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Owning entity name"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an owning-entity"/>
+                <xml-property name="indexedProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="searchable" value="owning-entity-id"/>
+                <xml-property name="uniqueProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="container" value="owning-entities"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/owning-entities/owning-entity/{owning-entity-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Platforms">
+            <xml-properties>
+                <xml-property name="description" value="Collection of platforms"/>
+            </xml-properties>
+            <xml-root-element name="platforms"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v13.Platform"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Platform">
+            <xml-root-element name="platform"/>
+            <java-attributes>
+                <xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the platform"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a platform"/>
+                <xml-property name="indexedProps" value="platform-name"/>
+                <xml-property name="uniqueProps" value="platform-name"/>
+                <xml-property name="container" value="platforms"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/platforms/platform/{platform-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceSubscriptions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of objects that group service instances."/>
+            </xml-properties>
+            <xml-root-element name="service-subscriptions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v13.ServiceSubscription"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceSubscription">
+            <xml-root-element name="service-subscription"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
+                    </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="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v13.ServiceInstances">
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Object that group service instances."/>
+                <xml-property name="indexedProps" value="service-type"/>
+                <xml-property name="dependentOn" value="customer"/>
+                <xml-property name="container" value="service-subscriptions"/>
+                <xml-property name="crossEntityReference" value="service-instance,service-type"/>
+                <xml-property name="uriTemplate" value="/service-subscriptions/service-subscription/{service-type}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceInstances">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service instances"/>
+            </xml-properties>
+            <xml-root-element name="service-instances"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v13.ServiceInstance"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceInstance">
+            <xml-root-element name="service-instance"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this instance of a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
+                    <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="serviceType" name="service-type" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing the service role."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the environment context assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the workload context assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="createdAt" name="created-at" required="false" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="create time of Network Service." />
@@ -2705,1602 +2730,1617 @@
                 </xml-element>
                 <!-- for storing the nsd_id create edge between services -->
                 <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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL customers will use to access the vHN Portal." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
-					</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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
-				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v13.AllottedResources" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Instance of a service" />
-				<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,environment-context,workload-context" />
-				<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" />
-				<xml-property name="dependentOn" value="service-subscription" />
-				<xml-property name="container" value="service-instances" />
-			</xml-properties>
-		</java-type>
+                    <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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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">
+                    <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="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL customers will use to access the vHN Portal."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used."/>
+                    </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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata"/>
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v13.AllottedResources"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a service"/>
+                <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,environment-context,workload-context"/>
+                <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"/>
+                <xml-property name="dependentOn" value="service-subscription"/>
+                <xml-property name="container" value="service-instances"/>
+                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceDesignAndCreation">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for objects managed by ASDC" />
-			</xml-properties>
-			<xml-root-element name="service-design-and-creation" />
-			<java-attributes>
-				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v13.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v13.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v13.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v13.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v13.NamedQueries" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ServiceDesignAndCreation">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for objects managed by ASDC"/>
+            </xml-properties>
+            <xml-root-element name="service-design-and-creation"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v13.VnfImages"/>
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v13.Services"/>
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v13.ServiceCapabilities"/>
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v13.Models"/>
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v13.NamedQueries"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VnfImages">
-			<xml-properties>
-				<xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
-			</xml-properties>
-			<xml-root-element name="vnf-images" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v13.VnfImage" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VnfImages">
+            <xml-properties>
+                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+            </xml-properties>
+            <xml-root-element name="vnf-images"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v13.VnfImage"/>
+            </java-attributes>
+        </java-type>
 
-		<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-properties>
-						<xml-property name="description" value="Unique ID of this asset" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
-				<xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" />
-				<xml-property name="uniqueProps" value="vnf-image-uuid" />
-				<xml-property name="container" value="vnf-images" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
+        <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-properties>
+                        <xml-property name="description" value="Unique ID of this asset"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version"/>
+                <xml-property name="uniqueProps" value="vnf-image-uuid"/>
+                <xml-property name="container" value="vnf-images"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Services">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC." />
-			</xml-properties>
-			<xml-root-element name="services" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v13.Service" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Services">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
+            </xml-properties>
+            <xml-root-element name="services"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v13.Service"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Service">
-			<xml-root-element name="service" />
-			<java-attributes>
-				<xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description of the service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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="serviceVersion" name="service-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="service version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
-				<xml-property name="indexedProps" value="service-description,service-id" />
-				<xml-property name="container" value="services" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Service">
+            <xml-root-element name="service"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of the service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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="serviceVersion" name="service-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="service version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services."/>
+                <xml-property name="indexedProps" value="service-description,service-id"/>
+                <xml-property name="container" value="services"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/services/service/{service-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceCapabilities">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service capabilities." />
-			</xml-properties>
-			<xml-root-element name="service-capabilities" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v13.ServiceCapability" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ServiceCapabilities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service capabilities."/>
+            </xml-properties>
+            <xml-root-element name="service-capabilities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v13.ServiceCapability"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ServiceCapability">
-			<xml-root-element name="service-capability" />
-			<java-attributes>
-				<xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="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="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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
-				<xml-property name="indexedProps" value="service-type,vnf-type" />
-				<xml-property name="container" value="service-capabilities" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
+        <java-type name="ServiceCapability">
+            <xml-root-element name="service-capability"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="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="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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
+                <xml-property name="indexedProps" value="service-type,vnf-type"/>
+                <xml-property name="container" value="service-capabilities"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Network">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for network inventory resources." />
-			</xml-properties>
-			<xml-root-element name="network" />
-			<java-attributes>
-				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v13.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v13.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v13.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v13.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v13.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v13.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v13.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v13.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v13.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v13.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v13.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v13.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v13.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v13.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v13.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v13.RouteTableReferences" />
-				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v13.InstanceGroups" />
-				<xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v13.Zones" />
-				<xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v13.Configurations" />
-				<xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v13.ForwardingPaths" />
-				<xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v13.Collections" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Network">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for network inventory resources."/>
+            </xml-properties>
+            <xml-root-element name="network"/>
+            <java-attributes>
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v13.LogicalLinks"/>
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v13.SitePairSets"/>
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v13.VpnBindings"/>
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v13.VplsPes"/>
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v13.MulticastConfigurations"/>
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v13.Vces"/>
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v13.Vnfcs"/>
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v13.L3Networks"/>
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v13.NetworkPolicies"/>
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v13.GenericVnfs"/>
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v13.LagLinks"/>
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v13.Newvces"/>
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v13.Pnfs"/>
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v13.PhysicalLinks"/>
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v13.IpsecConfigurations"/>
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v13.RouteTableReferences"/>
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v13.InstanceGroups"/>
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v13.Zones"/>
+                <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v13.Configurations"/>
+                <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v13.ForwardingPaths"/>
+                <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v13.Collections"/>
+            </java-attributes>
+        </java-type>
         <java-type name="Configurations">
-			<xml-properties>
-				<xml-property name="description" value="Collection of configurations" />
-			</xml-properties>
-			<xml-root-element name="configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v13.Configuration" />
-			</java-attributes>
-		</java-type>
+            <xml-properties>
+                <xml-property name="description" value="Collection of configurations"/>
+            </xml-properties>
+            <xml-root-element name="configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v13.Configuration"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Configuration">
-			<xml-root-element name="configuration" />
-			<java-attributes>
-				<xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID assigned to configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="port-mirroring-configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationSubType" name="configuration-sub-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="vprobe, pprobe." />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of the configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id of  the configuration used to customize the resource" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="DHV Site Effective Bandwidth" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Velocloud Nominal Throughput - VNT" />
-					</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.v13.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
-				<xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v13.ForwarderEvcs" />
-				<xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v13.Evcs" />
-			</java-attributes>
-			<xml-properties>
-                <xml-property name="description" value="Port Mirror Configuration." />
-				<xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" />
-				<xml-property name="uniqueProps" value="configuration-id" />
-				<xml-property name="container" value="configurations" />
-				<xml-property name="namespace" value="network" />
-                <xml-property name="nameProps" value="configuration-type" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Configuration">
+            <xml-root-element name="configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID assigned to configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="port-mirroring-configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSubType" name="configuration-sub-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vprobe, pprobe."/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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 the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSelflink" name="configuration-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of  the configuration used to customize the resource"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DHV Site Effective Bandwidth"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Velocloud Nominal Throughput - VNT"/>
+                    </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.v13.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata"/>
+                <xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v13.ForwarderEvcs"/>
+                <xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v13.Evcs"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic configuration object."/>
+                <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id"/>
+                <xml-property name="uniqueProps" value="configuration-id"/>
+                <xml-property name="container" value="configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/configurations/configuration/{configuration-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="LogicalLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of logical connections" />
-			</xml-properties>
-			<xml-root-element name="logical-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v13.LogicalLink" />
-			</java-attributes>
-		</java-type>
+        <java-type name="LogicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical connections"/>
+            </xml-properties>
+            <xml-root-element name="logical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v13.LogicalLink"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="LogicalLink">
-			<xml-root-element name="logical-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element 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 java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of logical link, e.g., evc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
+        <java-type name="LogicalLink">
+            <xml-root-element name="logical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element 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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of logical link, e.g., evc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
 						<xml-property name="description" value="v4, v6, or ds for dual stack" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="For example, static or BGP" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indication of operational status of the logical link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indication of the network use of the logical link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
-					</xml-properties>
-				</xml-element>
-					<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Reason for this entity, role it is playing" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
-				<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-property name="searchable" value="link-name" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="SitePairSets">
-			<xml-properties>
-				<xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" />
-			</xml-properties>
-			<xml-root-element name="site-pair-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v13.SitePairSet" />
-			</java-attributes>
-		</java-type>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="For example, static or BGP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of operational status of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of the network use of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Reason for this entity, role it is playing"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/>
+                <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-property name="searchable" value="link-name"/>
+                <xml-property name="uriTemplate" value="/network/logical-links/logical-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="SitePairSet">
-			<xml-root-element name="site-pair-set" />
-			<java-attributes>
-				<xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of site pair set." />
-					</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="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v13.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
-				<xml-property name="indexedProps" value="site-pair-set-id" />
-				<xml-property name="uniqueProps" value="site-pair-set-id" />
-				<xml-property name="container" value="site-pair-sets" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="SitePairSets">
+            <xml-properties>
+                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf"/>
+            </xml-properties>
+            <xml-root-element name="site-pair-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v13.SitePairSet"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="RoutingInstances">
-			<xml-properties>
-				<xml-property name="description" value="set of probes related to generic-vnf routing instance" />
-			</xml-properties>
-			<xml-root-element name="routing-instances" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v13.RoutingInstance" />
-			</java-attributes>
-		</java-type>
+        <java-type name="SitePairSet">
+            <xml-root-element name="site-pair-set"/>
+            <java-attributes>
+                <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of site pair set."/>
+                    </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="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v13.RoutingInstances"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
+                <xml-property name="indexedProps" value="site-pair-set-id"/>
+                <xml-property name="uniqueProps" value="site-pair-set-id"/>
+                <xml-property name="container" value="site-pair-sets"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/site-pair-sets/site-pair-set/{site-pair-set-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="RoutingInstance">
-			<xml-root-element name="routing-instance" />
-			<java-attributes>
-				<xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of routing instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="rpm owner" />
-					</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="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v13.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="routing-instance-id" />
-				<xml-property name="dependentOn" value="site-pair-set" />
-				<xml-property name="container" value="routing-instances" />
-			</xml-properties>
-		</java-type>
+        <java-type name="RoutingInstances">
+            <xml-properties>
+                <xml-property name="description" value="set of probes related to generic-vnf routing instance"/>
+            </xml-properties>
+            <xml-root-element name="routing-instances"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v13.RoutingInstance"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="SitePairs">
-			<xml-properties>
-				<xml-property name="description" value="probe within a set" />
-			</xml-properties>
-			<xml-root-element name="site-pairs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v13.SitePair" />
-			</java-attributes>
-		</java-type>
+        <java-type name="RoutingInstance">
+            <xml-root-element name="routing-instance"/>
+            <java-attributes>
+                <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of routing instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rpm owner"/>
+                    </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="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v13.SitePairs"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="routing-instance-id"/>
+                <xml-property name="dependentOn" value="site-pair-set"/>
+                <xml-property name="container" value="routing-instances"/>
+                <xml-property name="uriTemplate" value="/routing-instances/routing-instance/{routing-instance-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="SitePair">
-			<xml-root-element name="site-pair" />
-			<java-attributes>
-				<xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prefix address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prefix address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip version, v4, v6" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." />
-					</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="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v13.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="site-pair-id" />
-				<xml-property name="uniqueProps" value="site-pair-id" />
-				<xml-property name="dependentOn" value="routing-instance" />
-				<xml-property name="container" value="site-pairs" />
-			</xml-properties>
-		</java-type>
+        <java-type name="SitePairs">
+            <xml-properties>
+                <xml-property name="description" value="probe within a set"/>
+            </xml-properties>
+            <xml-root-element name="site-pairs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v13.SitePair"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ClassesOfService">
-			<xml-properties>
-				<xml-property name="description" value="class-of-service of probe" />
-			</xml-properties>
-			<xml-root-element name="classes-of-service" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v13.ClassOfService" />
-			</java-attributes>
-		</java-type>
+        <java-type name="SitePair">
+            <xml-root-element name="site-pair"/>
+            <java-attributes>
+                <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version, v4, v6"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc."/>
+                    </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="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v13.ClassesOfService"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="site-pair-id"/>
+                <xml-property name="uniqueProps" value="site-pair-id"/>
+                <xml-property name="dependentOn" value="routing-instance"/>
+                <xml-property name="container" value="site-pairs"/>
+                <xml-property name="uriTemplate" value="/site-pairs/site-pair/{site-pair-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ClassOfService">
-			<xml-root-element name="class-of-service" />
-			<java-attributes>
-				<xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="type of probe" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="cos" />
-				<xml-property name="dependentOn" value="site-pair" />
-				<xml-property name="container" value="classes-of-service" />
-			</xml-properties>
-		</java-type>
+        <java-type name="ClassesOfService">
+            <xml-properties>
+                <xml-property name="description" value="class-of-service of probe"/>
+            </xml-properties>
+            <xml-root-element name="classes-of-service"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v13.ClassOfService"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VpnBindings">
-			<xml-root-element name="vpn-bindings" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v13.VpnBinding" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ClassOfService">
+            <xml-root-element name="class-of-service"/>
+            <java-attributes>
+                <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type of probe"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="cos"/>
+                <xml-property name="dependentOn" value="site-pair"/>
+                <xml-property name="container" value="classes-of-service"/>
+                <xml-property name="uriTemplate" value="/classes-of-service/class-of-service/{cos}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VpnBinding">
-			<xml-root-element name="vpn-binding" />
-			<java-attributes>
-				<xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="VPN ID, globally unique within A&amp;AI" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="VPN Name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="region of customer vpn" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id for this customer vpn" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
-					</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="routeTargets" name="route-targets" type="inventory.aai.onap.org.v13.RouteTargets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList">
-					<xml-properties>
-						<xml-property name="description" value="l3-networks relate to vpn-bindings" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="VPN binding" />
-				<xml-property name="nameProps" value="vpn-name,vpn-type" />
-				<xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type" />
-				<xml-property name="searchable" value="vpn-id,vpn-name" />
-				<xml-property name="uniqueProps" value="vpn-id" />
-				<xml-property name="container" value="vpn-bindings" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="VpnBindings">
+            <xml-root-element name="vpn-bindings"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v13.VpnBinding"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VplsPes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of VPLS Provider Edge routers" />
-			</xml-properties>
-			<xml-root-element name="vpls-pes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v13.VplsPe" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VpnBinding">
+            <xml-root-element name="vpn-binding"/>
+            <java-attributes>
+                <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN Name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="region of customer vpn"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id for this customer vpn"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network."/>
+                    </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="routeTargets" name="route-targets" type="inventory.aai.onap.org.v13.RouteTargets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList">
+                    <xml-properties>
+                        <xml-property name="description" value="l3-networks relate to vpn-bindings"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPN binding"/>
+                <xml-property name="nameProps" value="vpn-name,vpn-type"/>
+                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type"/>
+                <xml-property name="searchable" value="vpn-id,vpn-name"/>
+                <xml-property name="uniqueProps" value="vpn-id"/>
+                <xml-property name="container" value="vpn-bindings"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpn-bindings/vpn-binding/{vpn-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VplsPe">
-			<xml-root-element name="vpls-pe" />
-			<java-attributes>
-				<xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Temporary location for stag to get to VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v13.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="VPLS Provider Edge routers." />
-				<xml-property name="indexedProps" value="prov-status,equipment-name" />
-				<xml-property name="container" value="vpls-pes" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="VplsPes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VPLS Provider Edge routers"/>
+            </xml-properties>
+            <xml-root-element name="vpls-pes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v13.VplsPe"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="MulticastConfigurations">
-			<xml-properties>
-				<xml-property name="description" value="multicast configuration of generic-vnf ip-address" />
-			</xml-properties>
-			<xml-root-element name="multicast-configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v13.MulticastConfiguration" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VplsPe">
+            <xml-root-element name="vpls-pe"/>
+            <java-attributes>
+                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for stag to get to VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v13.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPLS Provider Edge routers."/>
+                <xml-property name="indexedProps" value="prov-status,equipment-name"/>
+                <xml-property name="container" value="vpls-pes"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpls-pes/vpls-pe/{equipment-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="MulticastConfiguration">
-			<xml-root-element name="multicast-configuration" />
-			<java-attributes>
-				<xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of multicast configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="protocol of multicast configuration" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="rp type of multicast configuration" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="multicast-configuration-id" />
-				<xml-property name="uniqueProps" value="multicast-configuration-id" />
-				<xml-property name="container" value="multicast-configurations" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="MulticastConfigurations">
+            <xml-properties>
+                <xml-property name="description" value="multicast configuration of generic-vnf ip-address"/>
+            </xml-properties>
+            <xml-root-element name="multicast-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v13.MulticastConfiguration"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Vces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated." />
-			</xml-properties>
-			<xml-root-element name="vces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v13.Vce" />
-			</java-attributes>
-		</java-type>
+        <java-type name="MulticastConfiguration">
+            <xml-root-element name="multicast-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of multicast configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="protocol of multicast configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rp type of multicast configuration"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="multicast-configuration-id"/>
+                <xml-property name="uniqueProps" value="multicast-configuration-id"/>
+                <xml-property name="container" value="multicast-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vce">
-			<xml-root-element name="vce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternate name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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 strictly map to ASDC services, 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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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="Network role being played by this VNF" />
-					</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, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of VPE connected to this VCE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Loopback0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  see child relationships" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v13.PortGroups" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v13.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v13.Entitlements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
-				<xml-property name="nameProps" value="vnf-name" />
-				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" />
-				<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-				<xml-property name="uniqueProps" value="vnf-id" />
-				<xml-property name="container" value="vces" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated."/>
+            </xml-properties>
+            <xml-root-element name="vces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v13.Vce"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="PortGroups">
-			<xml-root-element name="port-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v13.PortGroup" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Vce">
+            <xml-root-element name="vce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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 strictly map to ASDC services, 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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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="Network role being played by this VNF"/>
+                    </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, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of VPE connected to this VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Loopback0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  see child relationships"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v13.PortGroups"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v13.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v13.Entitlements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="vces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="uriTemplate" value="/network/vces/vce/{vnf-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="PortGroup">
-			<xml-root-element name="port-group" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network name of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="portGroupId" name="port-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for port group in vmware" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Likely to duplicate value of neutron network name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v13.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Used to capture the network interfaces of this VCE" />
-				<xml-property name="nameProps" value="port-group-name" />
-				<xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" />
-				<xml-property name="dependentOn" value="vce" />
-				<xml-property name="container" value="port-groups" />
-			</xml-properties>
-		</java-type>
+        <java-type name="PortGroups">
+            <xml-root-element name="port-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v13.PortGroup"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="CvlanTags">
-			<xml-root-element name="cvlan-tags" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v13.CvlanTagEntry" />
-			</java-attributes>
-		</java-type>
+        <java-type name="PortGroup">
+            <xml-root-element name="port-group"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network name of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="portGroupId" name="port-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for port group in vmware"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Likely to duplicate value of neutron network name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v13.CvlanTags"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
+                <xml-property name="nameProps" value="port-group-name"/>
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+                <xml-property name="dependentOn" value="vce"/>
+                <xml-property name="container" value="port-groups"/>
+                <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="CvlanTagEntry">
-			<xml-root-element name="cvlan-tag-entry" />
-			<java-attributes>
-				<xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="See mis-na-virtualization-platform.yang" />
-					</xml-properties>
-				</xml-element>
-				<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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="dependentOn" value="port-group" />
-				<xml-property name="indexedProps" value="cvlan-tag" />
-				<xml-property name="container" value="cvlan-tags" />
-			</xml-properties>
-		</java-type>
+        <java-type name="CvlanTags">
+            <xml-root-element name="cvlan-tags"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v13.CvlanTagEntry"/>
+            </java-attributes>
+        </java-type>
 
+        <java-type name="CvlanTagEntry">
+            <xml-root-element name="cvlan-tag-entry"/>
+            <java-attributes>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
+                    </xml-properties>
+                </xml-element>
+                <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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="dependentOn" value="port-group"/>
+                <xml-property name="indexedProps" value="cvlan-tag"/>
+                <xml-property name="container" value="cvlan-tags"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/>
+            </xml-properties>
+        </java-type>
 
 
-		<java-type name="Vnfcs">
-			<xml-properties>
-				<xml-property name="description" value="virtual network components associated with a vserver from application controller." />
-			</xml-properties>
-			<xml-root-element name="vnfcs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v13.Vnfc" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Vnfcs">
+            <xml-properties>
+                <xml-property name="description" value="virtual network components associated with a vserver from application controller."/>
+            </xml-properties>
+            <xml-root-element name="vnfcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v13.Vnfc"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Vnfc">
-			<xml-root-element name="vnfc" />
-			<java-attributes>
-				<xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of vnfc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Short code that is used in naming instances of the item being modeled" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="prov status of this vnfc" />
-					</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, mastered by APP-C" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Oam V4 vip address of this vnfc" />
-					</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)" />
-					</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="groupNotation" name="group-notation" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group notation of VNFC" />
-					</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="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="requires" value="model-invariant-id" />
-					</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.v13.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id" />
-				<xml-property name="searchable" value="vnfc-name" />
-				<xml-property name="container" value="vnfcs" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vnfc">
+            <xml-root-element name="vnfc"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vnfc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Short code that is used in naming instances of the item being modeled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="prov status of this vnfc"/>
+                    </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, mastered by APP-C"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Oam V4 vip address of this vnfc"/>
+                    </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 default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="groupNotation" name="group-notation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group notation of VNFC"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                    </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.v13.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id"/>
+                <xml-property name="searchable" value="vnfc-name"/>
+                <xml-property name="container" value="vnfcs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vnfcs/vnfc/{vnfc-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="L3Networks">
-			<xml-root-element name="l3-networks" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v13.L3Network" />
-			</java-attributes>
-		</java-type>
+        <java-type name="L3Networks">
+            <xml-root-element name="l3-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v13.L3Network"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="L3Network">
-			<xml-root-element name="l3-network" />
-			<java-attributes>
-				<xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network, governed by some naming convention.." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the network - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role the network plans - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network technology - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Set to true if bound to VPN" />
-					</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 from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="network role instance" />
-					</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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered 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="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contrail FQDN for the network" />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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="physicalNetworkName" name="physical-network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name associated with the physical network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is a provider network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is a shared network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is an external network." />
-					</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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v13.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v13.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v13.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" >
-					<xml-properties>
-						<xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Generic network definition" />
-				<xml-property name="nameProps" value="network-name" />
-				<xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
-				<xml-property name="searchable" value="network-id,network-name" />
-				<xml-property name="uniqueProps" value="network-id" />
-				<xml-property name="container" value="l3-networks" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		<java-type name="NetworkPolicies">
-			<xml-root-element name="network-policies" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v13.NetworkPolicy" />
-			</java-attributes>
-		</java-type>
-		<java-type name="NetworkPolicy">
-			<xml-root-element name="network-policy" />
-			<java-attributes>
-				<xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID representing unique key to this instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contrail FQDN for the policy" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID for the openStack Heat instance" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="nameProps" value="network-policy-fqdn" />
-				<xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" />
-				<xml-property name="searchable" value="network-policy-id,network-policy-fqdn" />
-				<xml-property name="uniqueProps" value="network-policy-id" />
-				<xml-property name="container" value="network-policies" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		<java-type name="CtagAssignments">
-			<xml-root-element name="ctag-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v13.CtagAssignment" />
-			</java-attributes>
-		</java-type>
+        <java-type name="L3Network">
+            <xml-root-element name="l3-network"/>
+            <java-attributes>
+                <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network, governed by some naming convention.."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the network - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role the network plans - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network technology - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isBoundToVpn" name="is-bound-to-vpn" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Set to true if bound to VPN"/>
+                    </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 from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="network role instance"/>
+                    </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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered 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="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the network"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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="physicalNetworkName" name="physical-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the physical network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is an external network."/>
+                    </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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v13.Subnets"/>
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v13.CtagAssignments"/>
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v13.SegmentationAssignments"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList">
+                    <xml-properties>
+                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic network definition"/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+                <xml-property name="searchable" value="network-id,network-name"/>
+                <xml-property name="uniqueProps" value="network-id"/>
+                <xml-property name="container" value="l3-networks"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/l3-networks/l3-network/{network-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="NetworkPolicies">
+            <xml-root-element name="network-policies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v13.NetworkPolicy"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="NetworkPolicy">
+            <xml-root-element name="network-policy"/>
+            <java-attributes>
+                <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID representing unique key to this instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the policy"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID for the openStack Heat instance"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="nameProps" value="network-policy-fqdn"/>
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="uniqueProps" value="network-policy-id"/>
+                <xml-property name="container" value="network-policies"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/network-policies/network-policy/{network-policy-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="CtagAssignments">
+            <xml-root-element name="ctag-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v13.CtagAssignment"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="CtagAssignment">
-			<xml-root-element name="ctag-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="id." />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="vlan-id-inner" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<xml-property name="container" value="ctag-assignments" />
-			</xml-properties>
-		</java-type>
+        <java-type name="CtagAssignment">
+            <xml-root-element name="ctag-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="id."/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vlan-id-inner"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="ctag-assignments"/>
+                <xml-property name="uriTemplate" value="/ctag-assignments/ctag-assignment/{vlan-id-inner}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Subnets">
-			<xml-root-element name="subnets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v13.Subnet" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Subnets">
+            <xml-root-element name="subnets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v13.Subnet"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Subnet">
-			<xml-root-element name="subnet" />
-			<java-attributes>
-				<xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Subnet ID, should be UUID." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name associated with the subnet." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of this subnet" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="gateway ip address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="network start address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="cidr mask" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip version" />
-					</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, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="dhcp enabled" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the start address reserved for use by dhcp" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the last address reserved for use by dhcp" />
-					</xml-properties>
-				</xml-element>
-					<xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role of the subnet, referenced when assigning IPs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip address assignment direction of the subnet" />
-					</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="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="sequence of the subnet" />
-					</xml-properties>
-				</xml-element>		
-				<xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v13.HostRoutes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />				
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="subnet-id,subnet-name" />
-				<xml-property name="nameProps" value="subnet-name" />
-				<xml-property name="uniqueProps" value="subnet-id" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<xml-property name="container" value="subnets" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Subnet">
+            <xml-root-element name="subnet"/>
+            <java-attributes>
+                <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Subnet ID, should be UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the subnet."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of this subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="gateway ip address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="network start address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="cidr mask"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version"/>
+                    </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, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="dhcpEnabled" name="dhcp-enabled" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="dhcp enabled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the start address reserved for use by dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the last address reserved for use by dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the subnet, referenced when assigning IPs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip address assignment direction of the subnet"/>
+                    </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="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="sequence of the subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v13.HostRoutes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="subnet-id,subnet-name"/>
+                <xml-property name="nameProps" value="subnet-name"/>
+                <xml-property name="uniqueProps" value="subnet-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="subnets"/>
+                <xml-property name="uriTemplate" value="/subnets/subnet/{subnet-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="GenericVnfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of VNFs" />
-			</xml-properties>
-			<xml-root-element name="generic-vnfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v13.GenericVnf" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="GenericVnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VNFs"/>
+            </xml-properties>
+            <xml-root-element name="generic-vnfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v13.GenericVnf"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="GenericVnf">
-			<xml-root-element name="generic-vnf" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="GenericVnf">
+            <xml-root-element name="generic-vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="vnf instance id." />
                     </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-property name="suggestibleOnSearch" value="true"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" 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-property name="suggestibleOnSearch" value="true"/>
+                <xml-element java-attribute="vnfName" name="vnf-name" 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-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" 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-property name="suggestibleOnSearch" value="true"/>
+                    </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-property name="suggestibleOnSearch" value="true"/>
 					</xml-properties>
 				</xml-element>
                 <xml-element java-attribute="vnfPackageName" name="vnf-package-name" required="false" type="java.lang.String">
@@ -4319,70 +4359,70 @@
                     </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-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 java-attribute="nshd" name="nshd" type="java.lang.Long">
                     <xml-properties>
                         <xml-property name="description" value="number of associated SHD in vnf." />
@@ -4398,2477 +4438,2532 @@
                         <xml-property name="description" value="number of network in vnf." />
                     </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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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-property name="suggestibleOnSearch" value="true"/>
-					</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-property name="suggestibleOnSearch" value="true"/>
-					</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="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Gateway address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length for oam-address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Temporary location for S-TAG to get to VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network Management profile of this VNF" />
-					</xml-properties>
-				</xml-element>			
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v13.VfModules" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v13.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v13.Entitlements" />
-			</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,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="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-				<xml-property name="containsSuggestibleProps" value="true"/>
-				<xml-property name="suggestionAliases" value="VNFs"/>
-			</xml-properties>
-		</java-type>
+                <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). 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" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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-property name="suggestibleOnSearch" value="true"/>
+                    </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-property name="suggestibleOnSearch" value="true"/>
+                    </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="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gateway address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length for oam-address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for S-TAG to get to VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network Management profile of this VNF"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces"/>
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v13.VfModules"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v13.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v13.Entitlements"/>
+            </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,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,operational-status"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="generic-vnfs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="containsSuggestibleProps" value="true"/>
+                <xml-property name="suggestionAliases" value="VNFs"/>
+                <xml-property name="uriTemplate" value="/network/generic-vnfs/generic-vnf/{vnf-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VfModules">
-			<xml-properties>
-				<xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
-			</xml-properties>
-			<xml-root-element name="vf-modules" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v13.VfModule" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VfModules">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs"/>
+            </xml-properties>
+            <xml-root-element name="vf-modules"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v13.VfModule"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VfModule">
-			<xml-root-element name="vf-module" />
-			<java-attributes>
-				<xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of vf-module." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of vf-module" />
-					</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." />
-					</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 vf-module, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" 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 base vf module" />
-					</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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the Contrail unique ID for a service-instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" />
-					</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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</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,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>
-		</java-type>
+        <java-type name="VfModule">
+            <xml-root-element name="vf-module"/>
+            <java-attributes>
+                <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vf-module."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vf-module"/>
+                    </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."/>
+                    </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 vf-module, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isBaseVfModule" name="is-base-vf-module" 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 base vf module"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="automatedAssignment" name="automated-assignment" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Indicates whether vf-module assignment was done via automation or manually"/>
+                    </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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the Contrail unique ID for a service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit"/>
+                    </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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </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,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-property name="uriTemplate" value="/vf-modules/vf-module/{vf-module-id}"/>
+            </xml-properties>
+        </java-type>
 
 
-		<java-type name="LagLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of link aggregation connections" />
-			</xml-properties>
-			<xml-root-element name="lag-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v13.LagLink" />
-			</java-attributes>
-		</java-type>
+        <java-type name="LagLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregation connections"/>
+            </xml-properties>
+            <xml-root-element name="lag-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v13.LagLink"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="LagLink">
-			<xml-root-element name="lag-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="LAG links can connect lag-interfaces" />
-				<xml-property name="indexedProps" value="link-name" />
-				<xml-property name="container" value="lag-links" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="LagLink">
+            <xml-root-element name="lag-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="LAG links can connect lag-interfaces"/>
+                <xml-property name="indexedProps" value="link-name"/>
+                <xml-property name="container" value="lag-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/lag-links/lag-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Newvces">
-			<xml-properties>
-				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-			</xml-properties>
-			<xml-root-element name="newvces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v13.Newvce" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Newvces">
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+            </xml-properties>
+            <xml-root-element name="newvces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v13.Newvce"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Newvce">
-			<xml-root-element name="newvce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternate name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  do not use" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Client should send valid enumerated value." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-				<xml-property name="nameProps" value="vnf-name" />
-				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" />
-				<xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" />
-				<xml-property name="uniqueProps" value="vnf-id2" />
-				<xml-property name="container" value="newvces" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Newvce">
+            <xml-root-element name="newvce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2"/>
+                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id2"/>
+                <xml-property name="container" value="newvces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/newvces/newvce/{vnf-id2}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Pnfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of Physical Network Functions." />
-			</xml-properties>
-			<xml-root-element name="pnfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v13.Pnf" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Pnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Physical Network Functions."/>
+            </xml-properties>
+            <xml-root-element name="pnfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v13.Pnf"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Pnf">
-			<xml-root-element name="pnf" />
-			<java-attributes>
-				<xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique name of Physical Network Function." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="name of Physical Network Function." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="source of name2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id of pnf" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." />
-					</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 java-attribute="frameId" name="frame-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Serial number of the device" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 OAM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
-					</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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." />
-				<xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status" />
-				<xml-property name="searchable" value="pnf-name" />
-				<xml-property name="uniqueProps" value="pnf-name" />
-				<xml-property name="container" value="pnfs" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Pnf">
+            <xml-root-element name="pnf"/>
+            <java-attributes>
+                <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique name of Physical Network Function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name of Physical Network Function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="source of name2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of pnf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF."/>
+                    </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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number of the device"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                    </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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The ASDC model id for this resource  model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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  model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
+                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id"/>
+                <xml-property name="searchable" value="pnf-name"/>
+                <xml-property name="uniqueProps" value="pnf-name"/>
+                <xml-property name="container" value="pnfs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/pnfs/pnf/{pnf-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="PhysicalLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
-			</xml-properties>
-			<xml-root-element name="physical-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v13.PhysicalLink" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="PhysicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+            </xml-properties>
+            <xml-root-element name="physical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v13.PhysicalLink"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="PhysicalLink">
-			<xml-root-element name="physical-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit it" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Dual access mode (e.g., primary, secondary" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the service Provider on this link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Upstream Bandwidth value agreed with the service provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Units for the upstream BW value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Downstream Bandwidth value agreed with the service provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Units for downstream BW value" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
-				<xml-property name="indexedProps" value="circuit-id,link-name" />
-				<xml-property name="alternateKeys1" value="circuit-id" />
-				<xml-property name="container" value="physical-links" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="searchable" value="link-name,circuit-id" />
-			</xml-properties>
-		</java-type>
+        <java-type name="PhysicalLink">
+            <xml-root-element name="physical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit it"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the service Provider on this link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for the upstream BW value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for downstream BW value"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+                <xml-property name="indexedProps" value="circuit-id,link-name"/>
+                <xml-property name="alternateKeys1" value="circuit-id"/>
+                <xml-property name="container" value="physical-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="searchable" value="link-name,circuit-id"/>
+                <xml-property name="uriTemplate" value="/network/physical-links/physical-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VigServers">
-			<xml-root-element name="vig-servers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v13.VigServer" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VigServers">
+            <xml-root-element name="vig-servers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v13.VigServer"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VigServer">
-			<xml-root-element name="vig-server" />
-			<java-attributes>
-				<xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" >
-					<xml-properties>
-						<xml-property name="description" value="v4 IP of the vig server" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" >
-					<xml-properties>
-						<xml-property name="description" value="v6 IP of the vig server" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
-				<xml-property name="indexedProps" value="vig-address-type" />
-				<xml-property name="dependentOn" value="ipsec-configuration" />
-				<xml-property name="container" value="vig-servers" />
-			</xml-properties>
-		</java-type>
+        <java-type name="VigServer">
+            <xml-root-element name="vig-server"/>
+            <java-attributes>
+                <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4 IP of the vig server"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v6 IP of the vig server"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607"/>
+                <xml-property name="indexedProps" value="vig-address-type"/>
+                <xml-property name="dependentOn" value="ipsec-configuration"/>
+                <xml-property name="container" value="vig-servers"/>
+                <xml-property name="uriTemplate" value="/vig-servers/vig-server/{vig-address-type}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="IpsecConfigurations">
-			<xml-root-element name="ipsec-configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v13.IpsecConfiguration" />
-			</java-attributes>
-		</java-type>
+        <java-type name="IpsecConfigurations">
+            <xml-root-element name="ipsec-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v13.IpsecConfiguration"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="IpsecConfiguration">
-			<xml-root-element name="ipsec-configuration" />
-			<java-attributes>
-				<xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of this configuration" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network address of shared DMZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="can be 1 or 2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" />
-					</xml-properties>
-				</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-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="pre-shared key for the above group name " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Lifetime for IKEv1 SA" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="md5, sha1, sha256, sha384" />
-					</xml-properties>
-				</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-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Life time for IPSec SA" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="enable PFS or not" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The time between DPD probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" />
-					</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.v13.RelationshipList" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v13.VigServers" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
-				<xml-property name="indexedProps" value="ipsec-configuration-id" />
-				<xml-property name="uniqueProps" value="ipsec-configuration-id" />
-				<xml-property name="container" value="ipsec-configurations" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="IpsecConfiguration">
+            <xml-root-element name="ipsec-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of this configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network address of shared DMZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="can be 1 or 2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384"/>
+                    </xml-properties>
+                </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-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="pre-shared key for the above group name "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Lifetime for IKEv1 SA"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="md5, sha1, sha256, sha384"/>
+                    </xml-properties>
+                </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-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Life time for IPSec SA"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="enable PFS or not"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The time between DPD probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down"/>
+                    </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.v13.RelationshipList"/>
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v13.VigServers"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
+                <xml-property name="indexedProps" value="ipsec-configuration-id"/>
+                <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
+                <xml-property name="container" value="ipsec-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}"/>
+            </xml-properties>
+        </java-type>
 
 
-		<java-type name="NotificationEvent">
-			<xml-root-element name="notification-event" />
-			<java-attributes>
-				<xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" />
-				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v13.NotificationEventHeader" />
-				<xml-any-element java-attribute="entity" />
-			</java-attributes>
-		</java-type>
-		<java-type name="NotificationEventHeader">
-			<xml-root-element name="notification-event-header" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" type="java.lang.String" />
-				<xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" />
-				<xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" />
-				<xml-element java-attribute="domain" name="domain" type="java.lang.String" />
-				<xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" />
-				<xml-element java-attribute="severity" name="severity" type="java.lang.String" />
-				<xml-element java-attribute="eventType" name="event-type" type="java.lang.String" />
-				<xml-element java-attribute="version" name="version" type="java.lang.String" />
-				<xml-element java-attribute="action" name="action" type="java.lang.String" />
-				<xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" />
-				<xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" />
-				<xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" />
-				<xml-element java-attribute="status" name="status" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-		<java-type name="AaiInternal">
-			<xml-root-element name="aai-internal" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v13.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v13.EdgePropNames" />
-			</java-attributes>
-		</java-type>
-		<java-type name="ReservedPropNames">
-			<xml-properties>
-				<xml-property name="description" value="Internal map to define some reserved properties of a vertex" />
-				<xml-property name="uniqueProps" value="aai-unique-key" />
-				<xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri" />
-			</xml-properties>
-			<xml-root-element name="reserved-prop-names" />
-			<java-attributes>
-				<xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" />
-				<xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String" />
-				<xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" />
-				<xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" />
-				<xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" />
-				<xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" />
-				<xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-		<java-type name="EdgePropNames">
-			<!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
-			<xml-properties>
-				<xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" />
-				<xml-property name="edgeInfo" value="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
-                <xml-property name="uniqueProps" value="aai-uuid" />
-                <xml-property name="indexedProps" value="aai-uuid" />
+        <java-type name="NotificationEvent">
+            <xml-root-element name="notification-event"/>
+            <java-attributes>
+                <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String"/>
+                <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v13.NotificationEventHeader"/>
+                <xml-any-element java-attribute="entity"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="NotificationEventHeader">
+            <xml-root-element name="notification-event-header"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" type="java.lang.String"/>
+                <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String"/>
+                <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String"/>
+                <xml-element java-attribute="domain" name="domain" type="java.lang.String"/>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String"/>
+                <xml-element java-attribute="severity" name="severity" type="java.lang.String"/>
+                <xml-element java-attribute="eventType" name="event-type" type="java.lang.String"/>
+                <xml-element java-attribute="version" name="version" type="java.lang.String"/>
+                <xml-element java-attribute="action" name="action" type="java.lang.String"/>
+                <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String"/>
+                <xml-element java-attribute="status" name="status" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="AaiInternal">
+            <xml-root-element name="aai-internal"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v13.ReservedPropNames"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v13.EdgePropNames"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ReservedPropNames">
+            <xml-properties>
+                <xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
+                <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
+                <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
             </xml-properties>
-			<xml-root-element name="edge-prop-names" />
-			<java-attributes>
-				<xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
-				<xml-element java-attribute="direction" name="direction" type="java.lang.String" />
-				<xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
-				<xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String" />
-				<xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String" />
-				<xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String" />
-				<xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String" />
-				<xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+            <xml-root-element name="reserved-prop-names"/>
+            <java-attributes>
+                <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String"/>
+                <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long"/>
+                <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String"/>
+                <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long"/>
+                <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String"/>
+                <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String"/>
+                <xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="EdgePropNames">
+            <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
+            <xml-properties>
+                <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules"/>
+                <xml-property name="edgeInfo" value="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV"/>
+                <xml-property name="uniqueProps" value="aai-uuid"/>
+                <xml-property name="indexedProps" value="aai-uuid"/>
+            </xml-properties>
+            <xml-root-element name="edge-prop-names"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String"/>
+                <xml-element java-attribute="direction" name="direction" type="java.lang.String"/>
+                <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String"/>
+                <xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String"/>
+                <xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String"/>
+                <xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String"/>
+                <xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String"/>
+                <xml-element java-attribute="private" name="private" type="java.lang.Boolean"/>
+                <xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Models">
-			<xml-properties>
-				<xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" />
-			</xml-properties>
-			<xml-root-element name="models" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v13.Model" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Models">
+            <xml-properties>
+                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models"/>
+            </xml-properties>
+            <xml-root-element name="models"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v13.Model"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Model">
-			<xml-root-element name="model" />
-			<xml-properties>
-				<xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version" />
-				<xml-property name="nameProps" value="model-type" />
-				<xml-property name="indexedProps" value="model-invariant-id,model-type" />
-				<xml-property name="uniqueProps" value="model-invariant-id" />
-				<xml-property name="container" value="models" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
-					</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="modelVers" name="model-vers" type="inventory.aai.onap.org.v13.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Model">
+            <xml-root-element name="model"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version"/>
+                <xml-property name="nameProps" value="model-type"/>
+                <xml-property name="indexedProps" value="model-invariant-id,model-type"/>
+                <xml-property name="uniqueProps" value="model-invariant-id"/>
+                <xml-property name="container" value="models"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/models/model/{model-invariant-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                    </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="modelVers" name="model-vers" type="inventory.aai.onap.org.v13.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
 
-		<java-type name="ModelVers">
-			<xml-root-element name="model-vers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v13.ModelVer" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ModelVer">
-			<xml-root-element name="model-ver" />
-			<xml-properties>
-				<xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" />
-				<xml-property name="nameProps" value="model-name" />
-				<xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status" />
-				<xml-property name="uniqueProps" value="model-version-id" />
-				<xml-property name="container" value="model-vers" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the model, which can change from version to version." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Distribution Status" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description" />
-					</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="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelVers">
+            <xml-root-element name="model-vers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v13.ModelVer"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelElements">
-			<xml-root-element name="model-elements" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v13.ModelElement" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelVer">
+            <xml-root-element name="model-ver"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models"/>
+                <xml-property name="nameProps" value="model-name"/>
+                <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status"/>
+                <xml-property name="uniqueProps" value="model-version-id"/>
+                <xml-property name="container" value="model-vers"/>
+                <xml-property name="uriTemplate" value="/model-vers/model-ver/{model-version-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Distribution Status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description"/>
+                    </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="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelElement">
-			<xml-properties>
-				<xml-property name="description" value="Defines how other models combine to make up a higher-level model." />
-				<xml-property name="uniqueProps" value="model-element-uuid" />
-				<xml-property name="indexedProps" value="model-element-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="model-elements" />
-			</xml-properties>
-			<xml-root-element name="model-element" />
-			<java-attributes>
-				<xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="How many of this type of element are required/allowed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" >
-				</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="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements">
-					<xml-properties>
-						<xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v13.ModelConstraints">
-					<xml-properties>
-						<xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelElements">
+            <xml-root-element name="model-elements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v13.ModelElement"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelConstraints">
-			<xml-root-element name="model-constraints" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v13.ModelConstraint" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelElement">
+            <xml-properties>
+                <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
+                <xml-property name="uniqueProps" value="model-element-uuid"/>
+                <xml-property name="indexedProps" value="model-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-elements"/>
+                <xml-property name="uriTemplate" value="/model-elements/model-element/{model-element-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="model-element"/>
+            <java-attributes>
+                <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many of this type of element are required/allowed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String">
+                </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="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements">
+                    <xml-properties>
+                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v13.ModelConstraints">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelConstraint">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="model-constraint-uuid" />
-				<xml-property name="indexedProps" value="model-constraint-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="model-constraints" />
-			</xml-properties>
-			<xml-root-element name="model-constraint" />
-			<java-attributes>
-				<xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v13.ConstrainedElementSets" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelConstraints">
+            <xml-root-element name="model-constraints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v13.ModelConstraint"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ConstrainedElementSets">
-			<xml-root-element name="constrained-element-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v13.ConstrainedElementSet" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelConstraint">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="model-constraint-uuid"/>
+                <xml-property name="indexedProps" value="model-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-constraints"/>
+                <xml-property name="uriTemplate" value="/model-constraints/model-constraint/{model-constraint-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="model-constraint"/>
+            <java-attributes>
+                <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v13.ConstrainedElementSets"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ConstrainedElementSet">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="constrained-element-set-uuid" />
-				<xml-property name="indexedProps" value="constrained-element-set-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="constrained-element-sets" />
-			</xml-properties>
-			<xml-root-element name="constrained-element-set" />
-			<java-attributes>
-				<xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v13.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ConstrainedElementSets">
+            <xml-root-element name="constrained-element-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v13.ConstrainedElementSet"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ElementChoiceSets">
-			<xml-root-element name="element-choice-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v13.ElementChoiceSet" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ConstrainedElementSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
+                <xml-property name="indexedProps" value="constrained-element-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="constrained-element-sets"/>
+                <xml-property name="uriTemplate" value="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="constrained-element-set"/>
+            <java-attributes>
+                <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v13.ElementChoiceSets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ElementChoiceSet">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="element-choice-set-uuid" />
-				<xml-property name="indexedProps" value="element-choice-set-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="element-choice-sets" />
-			</xml-properties>
-			<xml-root-element name="element-choice-set" />
-			<java-attributes>
-				<xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ElementChoiceSets">
+            <xml-root-element name="element-choice-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v13.ElementChoiceSet"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="NamedQueries">
-			<xml-root-element name="named-queries" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v13.NamedQuery" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ElementChoiceSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
+                <xml-property name="indexedProps" value="element-choice-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="element-choice-sets"/>
+                <xml-property name="uriTemplate" value="/element-choice-sets/element-choice-set/{element-choice-set-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="element-choice-set"/>
+            <java-attributes>
+                <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="NamedQuery">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="nameProps" value="named-query-name" />
-				<xml-property name="uniqueProps" value="named-query-uuid" />
-				<xml-property name="indexedProps" value="named-query-uuid,named-query-name" />
-				<xml-property name="container" value="named-queries" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-			<xml-root-element name="named-query" />
-			<java-attributes>
-				<xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String" >
-					<xml-element-wrapper name="required-input-params" />
-				</xml-element>
-				<xml-element java-attribute="description" name="description" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v13.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="NamedQueries">
+            <xml-root-element name="named-queries"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v13.NamedQuery"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="NamedQueryElements">
-			<xml-root-element name="named-query-elements" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v13.NamedQueryElement" />
-			</java-attributes>
-		</java-type>
+        <java-type name="NamedQuery">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="nameProps" value="named-query-name"/>
+                <xml-property name="uniqueProps" value="named-query-uuid"/>
+                <xml-property name="indexedProps" value="named-query-uuid,named-query-name"/>
+                <xml-property name="container" value="named-queries"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/named-queries/named-query/{named-query-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="named-query"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String">
+                    <xml-element-wrapper name="required-input-params"/>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v13.NamedQueryElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="NamedQueryElement">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="uniqueProps" value="named-query-element-uuid" />
-				<xml-property name="indexedProps" value="named-query-element-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="named-query-elements" />
-			</xml-properties>
-			<xml-root-element name="named-query-element" />
-			<java-attributes>
-				<xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
-				<xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v13.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v13.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v13.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="NamedQueryElements">
+            <xml-root-element name="named-query-elements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v13.NamedQueryElement"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="RelatedLookups">
-			<xml-root-element name="related-lookups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v13.RelatedLookup" />
-			</java-attributes>
-		</java-type>
+        <java-type name="NamedQueryElement">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="named-query-element-uuid"/>
+                <xml-property name="indexedProps" value="named-query-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="named-query-elements"/>
+                <xml-property name="uriTemplate" value="/named-query-elements/named-query-element/{named-query-element-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="named-query-element"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String"/>
+                <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v13.NamedQueryElements"/>
+                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v13.RelatedLookups"/>
+                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v13.PropertyConstraints"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="RelatedLookup">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="uniqueProps" value="related-lookup-uuid" />
-				<xml-property name="indexedProps" value="related-lookup-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="related-lookups" />
-			</xml-properties>
-			<xml-root-element name="related-lookup" />
-			<java-attributes>
-				<xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="RelatedLookups">
+            <xml-root-element name="related-lookups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v13.RelatedLookup"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="PropertyConstraints">
-			<xml-root-element name="property-constraints" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v13.PropertyConstraint" />
-			</java-attributes>
-		</java-type>
+        <java-type name="RelatedLookup">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="related-lookup-uuid"/>
+                <xml-property name="indexedProps" value="related-lookup-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="related-lookups"/>
+                <xml-property name="uriTemplate" value="/related-lookups/related-lookup/{related-lookup-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="related-lookup"/>
+            <java-attributes>
+                <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="PropertyConstraint">
-			<xml-properties>
-				<xml-property name="description" value="TBD" />
-				<xml-property name="uniqueProps" value="property-constraint-uuid" />
-				<xml-property name="indexedProps" value="property-constraint-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="property-constraints" />
-			</xml-properties>
-			<xml-root-element name="property-constraint" />
-			<java-attributes>
-				<xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+        <java-type name="PropertyConstraints">
+            <xml-root-element name="property-constraints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v13.PropertyConstraint"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelAndNamedQuerySearch">
-			<xml-properties>
-				<xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="model-and-named-query-search" />
-			<java-attributes>
-				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v13.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v13.InstanceFilters" />
-				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v13.SecondaryFilts" />
-				<xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" />
-				<xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+        <java-type name="PropertyConstraint">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="property-constraint-uuid"/>
+                <xml-property name="indexedProps" value="property-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="property-constraints"/>
+                <xml-property name="uriTemplate" value="/property-constraints/property-constraint/{property-constraint-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="property-constraint"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="QueryParameters">
-			<xml-properties>
-				<xml-property name="description" value="QueryParameters for performing a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="query-parameters" />
-			<java-attributes>
-				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v13.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v13.OverloadedModel" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelAndNamedQuerySearch">
+            <xml-properties>
+                <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="model-and-named-query-search"/>
+            <java-attributes>
+                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v13.QueryParameters"/>
+                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v13.InstanceFilters"/>
+                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v13.SecondaryFilts"/>
+                <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="OverloadedModel">
-			<xml-root-element name="overloaded-model" />
-			<xml-properties>
-				<xml-property name="description" value="Allows for legacy POST of old-style and new-style models" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the model, which can change from version to version." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Invariant unique ID which does not change from version to version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description" />
-					</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="modelVers" name="model-vers" type="inventory.aai.onap.org.v13.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="QueryParameters">
+            <xml-properties>
+                <xml-property name="description" value="QueryParameters for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="query-parameters"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v13.NamedQuery"/>
+                <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v13.OverloadedModel"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="InstanceFilters">
-			<xml-properties>
-				<xml-property name="description" value="InstanceFilters for performing a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="instance-filters" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v13.InstanceFilter" />
-			</java-attributes>
-		</java-type>
+        <java-type name="OverloadedModel">
+            <xml-root-element name="overloaded-model"/>
+            <xml-properties>
+                <xml-property name="description" value="Allows for legacy POST of old-style and new-style models"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Invariant unique ID which does not change from version to version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description"/>
+                    </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="modelVers" name="model-vers" type="inventory.aai.onap.org.v13.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="InstanceFilter">
-			<xml-properties>
-				<xml-property name="description" value="InstanceFilter for performing a named-query or model query" />
-				<xml-property name="container" value="instance-filters" />
-			</xml-properties>
-			<xml-root-element name="instance-filter" />
-			<java-attributes>
-				<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-properties>
-			<xml-root-element name="secondary-filts" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v13.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-properties>
-			<xml-root-element name="secondary-filt" />
-			<java-attributes>
-				<xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
-			</java-attributes>
-		</java-type>
+        <java-type name="InstanceFilters">
+            <xml-properties>
+                <xml-property name="description" value="InstanceFilters for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="instance-filters"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v13.InstanceFilter"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Properties">
-			<xml-properties>
-				<xml-property name="description" value="Property holder for query properties or instance properties" />
-			</xml-properties>
-			<xml-root-element name="properties" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
+        <java-type name="InstanceFilter">
+            <xml-properties>
+                <xml-property name="description" value="InstanceFilter for performing a named-query or model query"/>
+                <xml-property name="container" value="instance-filters"/>
+            </xml-properties>
+            <xml-root-element name="instance-filter"/>
+            <java-attributes>
+                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ResponseList">
-			<xml-properties>
-				<xml-property name="description" value="Response container for the results of a named-query or model query" />
-			</xml-properties>
-			<xml-root-element name="response-list" />
-			<java-attributes>
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v13.InventoryResponseItems" />
-			</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-properties>
+            <xml-root-element name="secondary-filts"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v13.SecondaryFilt"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="InventoryResponseItems">
-			<xml-properties>
-				<xml-property name="description" value="Container for inventory items in response list" />
-				<xml-property name="container" value="response-list" />
-			</xml-properties>
-			<xml-root-element name="inventory-response-items" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v13.InventoryResponseItem" />
-			</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-properties>
+            <xml-root-element name="secondary-filt"/>
+            <java-attributes>
+                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="InventoryResponseItem">
-			<xml-properties>
-				<xml-property name="description" value="Inventory item for response list" />
-				<xml-property name="container" value="inventory-response-items" />
-			</xml-properties>
-			<xml-root-element name="inventory-response-item" />
-			<java-attributes>
-				<xml-element java-attribute="modelName" name="model-name" type="java.lang.String" />
-				<xml-any-element java-attribute="item" />
-				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v13.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v13.InventoryResponseItems" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Properties">
+            <xml-properties>
+                <xml-property name="description" value="Property holder for query properties or instance properties"/>
+            </xml-properties>
+            <xml-root-element name="properties"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ExtraProperties">
-			<xml-properties>
-				<xml-property name="description" value="Extra properties for inventory item for response list" />
-			</xml-properties>
-			<xml-root-element name="extra-properties" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v13.ExtraProperty" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ResponseList">
+            <xml-properties>
+                <xml-property name="description" value="Response container for the results of a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="response-list"/>
+            <java-attributes>
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v13.InventoryResponseItems"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ExtraProperty">
-			<xml-root-element name="extra-property" />
-			<java-attributes>
-				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="RouteTableReferences">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack route table references" />
-			</xml-properties>
-			<xml-root-element name="route-table-references" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v13.RouteTableReference" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="RouteTableReference">
-			<xml-root-element name="route-table-reference" />
-			<java-attributes>
-				<xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="FQDN entry in the route table." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.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="uniqueProps" value="route-table-reference-id" />
-				<xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" />
-				<xml-property name="container" value="route-table-references" />
-				<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-properties>
-			<xml-root-element name="instance-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v13.InstanceGroup" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="InstanceGroup">
-			<xml-root-element name="instance-group" />
-			<java-attributes>
-			
-			<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				
-				<xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role of the instance group." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="InventoryResponseItems">
+            <xml-properties>
+                <xml-property name="description" value="Container for inventory items in response list"/>
+                <xml-property name="container" value="response-list"/>
+            </xml-properties>
+            <xml-root-element name="inventory-response-items"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v13.InventoryResponseItem"/>
+            </java-attributes>
+        </java-type>
 
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ASDC model id for this resource or service model." />
-						<xml-property name="visibility" value="deployment" />
-						<xml-property name="requires" value="model-version-id" />
-						<xml-property name="dbAlias" value="model-invariant-id-local" />
-					</xml-properties>
-				</xml-element>
+        <java-type name="InventoryResponseItem">
+            <xml-properties>
+                <xml-property name="description" value="Inventory item for response list"/>
+                <xml-property name="container" value="inventory-response-items"/>
+            </xml-properties>
+            <xml-root-element name="inventory-response-item"/>
+            <java-attributes>
+                <xml-element java-attribute="modelName" name="model-name" type="java.lang.String"/>
+                <xml-any-element java-attribute="item"/>
+                <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v13.ExtraProperties"/>
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v13.InventoryResponseItems"/>
+            </java-attributes>
+        </java-type>
 
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ASDC model version uid for this resource model." />
-						<xml-property name="visibility" value="deployment" />
-						<xml-property name="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="instanceGroupType" name="instance-group-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Only valid value today is lower case ha for high availability" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				
-				<xml-element java-attribute="instanceGroupName" name="instance-group-name" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Instance-Group Name." />
-					</xml-properties>
-				</xml-element>
-				
-				<xml-element java-attribute="instanceGroupFunction" name="instance-group-function" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Instance-Group Function" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			
-			<xml-properties>
-				<xml-property name="description" value="General mechanism for grouping instances" />
-				<xml-property name="nameProps" value="description,instance-group-name" />
-				<xml-property name="uniqueProps" value="id" />
-				<xml-property name="searchable" value="id,description"/>
-				<xml-property name="indexedProps" value="id,description,type,sub-type,model-invariant-id,model-version-id" />
-				<xml-property name="container" value="instance-groups" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		
+        <java-type name="ExtraProperties">
+            <xml-properties>
+                <xml-property name="description" value="Extra properties for inventory item for response list"/>
+            </xml-properties>
+            <xml-root-element name="extra-properties"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v13.ExtraProperty"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="SegmentationAssignments">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack segmentation assignments" />
-			</xml-properties>
-			<xml-root-element name="segmentation-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v13.SegmentationAssignment" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="SegmentationAssignment">
-			<xml-root-element name="segmentation-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack segmentation assignment." />
-				<xml-property name="indexedProps" value="segmentation-id" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<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-properties>
-			<xml-root-element name="allotted-resources" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v13.AllottedResource" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="AllottedResource">
-			<xml-root-element name="allotted-resource" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="description" name="description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The descriptive information assigned to this allotted resource instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Link back to more information in the controller" />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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-properties>
-						<xml-property name="description" value="Concurrency 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" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="type" name="type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Generic description of the type of allotted resource." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="role" name="role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role in the network that this resource will be providing." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v13.TunnelXconnects" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.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,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 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-properties>
-			<xml-root-element name="tunnel-xconnects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v13.TunnelXconnect" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="TunnelXconnect">
-			<xml-root-element name="tunnel-xconnect" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN uplink bandwidth for WAN1" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN downlink bandwidth for WAN1" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN uplink bandwidth for WAN2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN downlink bandwidth for WAN2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.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="indexedProps" value="id" />
-				<xml-property name="dependentOn" value="allotted-resource" />
-				<xml-property name="container" value="tunnel-xconnects" />
-				<!--  <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-properties>
-			<xml-root-element name="entitlements" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v13.Entitlement" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="Entitlement">
-			<xml-root-element name="entitlement" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of an entitlement resource. " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</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" />
-				<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-properties>
-			<xml-root-element name="licenses" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v13.License" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="License">
-			<xml-root-element name="license" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of a license resource. " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</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" />
-				<xml-property name="container" value="licenses" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="Vnf">
-			<xml-root-element name="vnf"/>
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Abstract vnf class" />
-				<xml-property name="indexedProps" value="vnf-id" />
-				<xml-property name="uniqueProps" value="vnf-id" />
-				<xml-property name="inheritors" value="vce,generic-vnf" />
-				<xml-property name="abstract" value="true" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="Zones">
-			<xml-properties>
-				<xml-property name="description" value="Collection of zones" />
-			</xml-properties>
-			<xml-root-element name="zones" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v13.Zone" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ExtraProperty">
+            <xml-root-element name="extra-property"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Zone">
-			<xml-root-element name="zone" />
-			<java-attributes>
-				<xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Code assigned by AIC to the zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="English name associated with the zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Design of zone [Medium/Large…]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Context of zone [production/test]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="status" name="status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Status of a zone." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
-				<xml-property name="nameProps" value="zone-name" />
-				<xml-property name="indexedProps" value="zone-id,design-type,zone-context" />
-				<xml-property name="uniqueProps" value="zone-id" />
-				<xml-property name="container" value="zones" />
-				<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.v13.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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Route target information" />
-				<xml-property name="container" value="route-targets" />
-				<xml-property name="dependentOn" value="vpn-binding" />
-				<xml-property name="canBeLinked" value="true" />
-			</xml-properties>
-		</java-type>
-						
-		<java-type name="SriovPfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of SR-IOV Physical Functions." />
-			</xml-properties>
-			<xml-root-element name="sriov-pfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v13.SriovPf" />
-			</java-attributes>
-		</java-type>
-		<java-type name="SriovPf">
-			<xml-root-element name="sriov-pf" />
-			<java-attributes>
-				<xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Identifier for the sriov-pf" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="SR-IOV Physical Function" />
-				<xml-property name="indexedProps" value="pf-pci-id" />
-				<xml-property name="dependentOn" value="p-interface" />
-				<xml-property name="container" value="sriov-pfs" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="HostRoutes">
-			<xml-root-element name="host-routes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v13.HostRoute" />
-			</java-attributes>
-		</java-type>
-		<java-type name="HostRoute">
-			<xml-root-element name="host-route" />
-			<java-attributes>
-				<xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="host-route id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="subnet prefix" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Could be ip-address, hostname, or service-instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop" />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="host-route-id" />
-				<xml-property name="dependentOn" value="subnet" />
-				<xml-property name="container" value="host-routes" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="VipIpv4AddressList">
-			<xml-root-element name="vip-ipv4-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 32 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv4 Address Range" />
-				<xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="VipIpv6AddressList">
-			<xml-root-element name="vip-ipv6-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 128 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv6 Address Range" />
-				<xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="OperationalEnvironments">
-			<xml-properties>
-				<xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC." />
-			</xml-properties>
-			<xml-root-element name="operational-environments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v13.OperationalEnvironment" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="RouteTableReferences">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="route-table-references"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v13.RouteTableReference"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="OperationalEnvironment">
-			<xml-root-element name="operational-environment" />
-			<java-attributes>
-				<xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of an operational environment" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational Environment name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational Environment Type." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Status" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Tenant Context." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="workloadContext" name="workload-context" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Workload Context." />
-					</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.v13.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC." />
-				<xml-property name="indexedProps" value="operational-environment-id" />
-				<xml-property name="nameProps" value="operational-environment-name" />
-				<xml-property name="uniqueProps" value="operational-environment-id" />
-				<xml-property name="container" value="operational-environments" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="ForwardingPaths">
-			<xml-root-element name="forwarding-paths" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v13.ForwardingPath" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ForwardingPath">
-			<xml-root-element name="forwarding-path"/>
-			<xml-properties>
-				<xml-property name="namespace" value="network"/>
-				<xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name"/>
-				<xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
-			  <xml-property name="container" value="forwarding-paths" />
-			  <xml-property name="nameProps" value="forwarding-path-name" />
-			  <xml-property name="uniqueProps" value="forwarding-path-id" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of this FP"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the FP"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
-				<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="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the self link for this FP"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v13.Forwarders" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="Forwarders">
-			<xml-root-element name="forwarders" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v13.Forwarder" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="Forwarder">
-			<xml-root-element name="forwarder"/>
-			<xml-properties>
-				<xml-property name="indexedProps" value="sequence"/>
-				<xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
-				<xml-property name="container" value="forwarders" />
-				<xml-property name="dependentOn" value="forwarding-path" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of this segmentation"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ingress, intermediate, egress"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
-				<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>
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ForwarderEvcs">
-			<xml-root-element name="forwarder-evcs"/>
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v13.ForwarderEvc"/>
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ForwarderEvc">
-			<xml-root-element name="forwarder-evc"/>
-			<java-attributes>
-				<xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Key for forwarder-evc object"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Internal VLAN." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="SVLAN value for ingress of egress forwarder." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CVLAN value for ingress of egress forwarder." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
-				<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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="forwarder object is an optional child object of the Configuration object." />
-				<xml-property name="dependentOn" value="configuration" />
-				<xml-property name="uniqueProps" value="forwarder-evc-id" />
-				<xml-property name="container" value="forwarder-evcs" />
-			</xml-properties>
-		</java-type>
+        <java-type name="RouteTableReference">
+            <xml-root-element name="route-table-reference"/>
+            <java-attributes>
+                <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="FQDN entry in the route table."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
 
-		<java-type name="Evcs">
-			<xml-root-element name="evcs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v13.Evc" />
-			</java-attributes>
-		</java-type>
+            <xml-properties>
+                <xml-property name="description" value="Openstack route table reference."/>
+                <xml-property name="nameProps" value="route-table-reference-fqdn"/>
+                <xml-property name="uniqueProps" value="route-table-reference-id"/>
+                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+                <xml-property name="container" value="route-table-references"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/route-table-references/route-table-reference/{route-table-reference-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Evc">
-			<xml-root-element name="evc" />
-			<java-attributes>
-				<xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique/key field for the evc object" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Point-to-Point, Multi-Point" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Commited Information Rate" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CIR units" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Diversity Group ID" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="formerly Performance Group" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="EVC Circuit ID of ESP EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Committed Information Rate (For ESP)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CIR units (For ESP)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Identifies ESP" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Interconnect type on ingress side of EVC." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="tagode for collector side of EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="tagMode for network side of EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
-				<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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="evc object is an optional child object of the Configuration object." />
-				<xml-property name="dependentOn" value="configuration" />
-				<xml-property name="uniqueProps" value="evc-id" />
-				<xml-property name="container" value="evcs" />
-			</xml-properties>
-		</java-type>
+        <java-type name="InstanceGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="instance-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v13.InstanceGroup"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Collections">
-			<xml-root-element name="collections" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="collection" name="collection" type="inventory.aai.onap.org.v13.Collection" />
-			</java-attributes>
-		</java-type>
+        <java-type name="InstanceGroup">
+            <xml-root-element name="instance-group"/>
+            <java-attributes>
 
-		<java-type name="Collection">
-			<xml-root-element name="collection"/>
-			<java-attributes>
-				<xml-element java-attribute="collectionId" name="collection-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Collection Object UUID"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ASDC model id for this resource or service model" />
-						<xml-property name="visibility" value="deployment" />
-						<xml-property name="requires" value="model-version-id" />
-						<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="Model Version" />
-						<xml-property name="visibility" value="deployment" />
-						<xml-property name="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectionName" name="collection-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="collection name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectionType" name="collection-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Collection type" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectionRole" name="collection-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Collection Role" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectionFunction" name="collection-function" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Collection function" />
-					</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" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectionCustomizationId" name="collection-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
-				<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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="namespace" value="network" />
-				<xml-property name="description" value="represents the collection resource in the TOSCA model" />
-				<xml-property name="uniqueProps" value="collection-id" />
-				<xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id" />
-				<xml-property name="container" value="collections" />
-			</xml-properties>
-		</java-type>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the instance group."/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model version uid for this resource model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="instanceGroupType" name="instance-group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Only valid value today is lower case ha for high availability"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupName" name="instance-group-name" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance-Group Name."/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupFunction" name="instance-group-function" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance-Group Function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+
+            <xml-properties>
+                <xml-property name="description" value="General mechanism for grouping instances"/>
+                <xml-property name="nameProps" value="description,instance-group-name"/>
+                <xml-property name="uniqueProps" value="id"/>
+                <xml-property name="searchable" value="id,description"/>
+                <xml-property name="indexedProps" value="id,description,type,sub-type,model-invariant-id,model-version-id"/>
+                <xml-property name="container" value="instance-groups"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
+            </xml-properties>
+        </java-type>
+
+
+        <java-type name="SegmentationAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack segmentation assignments"/>
+            </xml-properties>
+            <xml-root-element name="segmentation-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v13.SegmentationAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SegmentationAssignment">
+            <xml-root-element name="segmentation-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack segmentation assignment."/>
+                <xml-property name="indexedProps" value="segmentation-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="segmentation-assignments"/>
+                <xml-property name="uriTemplate" value="/segmentation-assignments/segmentation-assignment/{segmentation-id}"/>
+            </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-properties>
+            <xml-root-element name="allotted-resources"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v13.AllottedResource"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AllottedResource">
+            <xml-root-element name="allotted-resource"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Link back to more information in the controller"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency 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"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Generic description of the type of allotted resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role in the network that this resource will be providing."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v13.TunnelXconnects"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.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,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-property name="uriTemplate" value="/allotted-resources/allotted-resource/{id}"/>
+            </xml-properties>
+        </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-properties>
+            <xml-root-element name="tunnel-xconnects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v13.TunnelXconnect"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="TunnelXconnect">
+            <xml-root-element name="tunnel-xconnect"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN1"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN1"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.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="indexedProps" value="id"/>
+                <xml-property name="dependentOn" value="allotted-resource"/>
+                <xml-property name="container" value="tunnel-xconnects"/>
+                <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/tunnel-xconnects/tunnel-xconnect/{id}"/>
+            </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-properties>
+            <xml-root-element name="entitlements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v13.Entitlement"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Entitlement">
+            <xml-root-element name="entitlement"/>
+            <java-attributes>
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of an entitlement resource. "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </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"/>
+                <xml-property name="container" value="entitlements"/>
+                <xml-property name="uriTemplate" value="/entitlements/entitlement/{group-uuid}/{resource-uuid}"/>
+            </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-properties>
+            <xml-root-element name="licenses"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v13.License"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="License">
+            <xml-root-element name="license"/>
+            <java-attributes>
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of a license resource. "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </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"/>
+                <xml-property name="container" value="licenses"/>
+                <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vnf">
+            <xml-root-element name="vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Abstract vnf class"/>
+                <xml-property name="indexedProps" value="vnf-id"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="inheritors" value="vce,generic-vnf"/>
+                <xml-property name="abstract" value="true"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Zones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of zones"/>
+            </xml-properties>
+            <xml-root-element name="zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v13.Zone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Zone">
+            <xml-root-element name="zone"/>
+            <java-attributes>
+                <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Code assigned by AIC to the zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English name associated with the zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Design of zone [Medium/Large…]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Context of zone [production/test]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status of a zone."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB"/>
+                <xml-property name="nameProps" value="zone-name"/>
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context"/>
+                <xml-property name="uniqueProps" value="zone-id"/>
+                <xml-property name="container" value="zones"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
+            </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.v13.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" type="java.lang.String" xml-key="true">
+                    <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" type="java.lang.String" xml-key="true">
+                    <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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Route target information"/>
+                <xml-property name="container" value="route-targets"/>
+                <xml-property name="dependentOn" value="vpn-binding"/>
+                <xml-property name="canBeLinked" value="true"/>
+                <xml-property name="uriTemplate" value="/route-targets/route-target/{global-route-target}/{route-target-role}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SriovPfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Physical Functions."/>
+            </xml-properties>
+            <xml-root-element name="sriov-pfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v13.SriovPf"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovPf">
+            <xml-root-element name="sriov-pf"/>
+            <java-attributes>
+                <xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier for the sriov-pf"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Physical Function"/>
+                <xml-property name="indexedProps" value="pf-pci-id"/>
+                <xml-property name="dependentOn" value="p-interface"/>
+                <xml-property name="container" value="sriov-pfs"/>
+                <xml-property name="uriTemplate" value="/sriov-pfs/sriov-pf/{pf-pci-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="HostRoutes">
+            <xml-root-element name="host-routes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v13.HostRoute"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="HostRoute">
+            <xml-root-element name="host-route"/>
+            <java-attributes>
+                <xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="host-route id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="subnet prefix"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop"/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="host-route-id"/>
+                <xml-property name="dependentOn" value="subnet"/>
+                <xml-property name="container" value="host-routes"/>
+                <xml-property name="uriTemplate" value="/host-routes/host-route/{host-route-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VipIpv4AddressList">
+            <xml-root-element name="vip-ipv4-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+            <xml-property name="uriTemplate" value="/vip-ipv4-address-list/{vip-ipv4-address}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VipIpv6AddressList">
+            <xml-root-element name="vip-ipv6-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+            <xml-property name="uriTemplate" value="/vip-ipv6-address-list/{vip-ipv6-address}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OperationalEnvironments">
+            <xml-properties>
+                <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
+            </xml-properties>
+            <xml-root-element name="operational-environments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v13.OperationalEnvironment"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OperationalEnvironment">
+            <xml-root-element name="operational-environment"/>
+            <java-attributes>
+                <xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an operational environment"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operational Environment name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operational Environment Type."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Tenant Context."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Workload Context."/>
+                    </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.v13.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
+                <xml-property name="indexedProps" value="operational-environment-id"/>
+                <xml-property name="nameProps" value="operational-environment-name"/>
+                <xml-property name="uniqueProps" value="operational-environment-id"/>
+                <xml-property name="container" value="operational-environments"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ForwardingPaths">
+            <xml-root-element name="forwarding-paths"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v13.ForwardingPath"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwardingPath">
+            <xml-root-element name="forwarding-path"/>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name"/>
+                <xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
+                <xml-property name="container" value="forwarding-paths"/>
+                <xml-property name="nameProps" value="forwarding-path-name"/>
+                <xml-property name="uniqueProps" value="forwarding-path-id"/>
+                <xml-property name="uriTemplate" value="/network/forwarding-paths/forwarding-path/{forwarding-path-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <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="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the self link for this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v13.Forwarders"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Forwarders">
+            <xml-root-element name="forwarders"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v13.Forwarder"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Forwarder">
+            <xml-root-element name="forwarder"/>
+            <xml-properties>
+                <xml-property name="indexedProps" value="sequence"/>
+                <xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
+                <xml-property name="container" value="forwarders"/>
+                <xml-property name="dependentOn" value="forwarding-path"/>
+                <xml-property name="uriTemplate" value="/forwarders/forwarder/{sequence}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this segmentation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ingress, intermediate, egress"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <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>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwarderEvcs">
+            <xml-root-element name="forwarder-evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v13.ForwarderEvc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwarderEvc">
+            <xml-root-element name="forwarder-evc"/>
+            <java-attributes>
+                <xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for forwarder-evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Internal VLAN."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="SVLAN value for ingress of egress forwarder."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value for ingress of egress forwarder."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="forwarder object is an optional child object of the Configuration object."/>
+                <xml-property name="dependentOn" value="configuration"/>
+                <xml-property name="uniqueProps" value="forwarder-evc-id"/>
+                <xml-property name="container" value="forwarder-evcs"/>
+                <xml-property name="uriTemplate" value="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Evcs">
+            <xml-root-element name="evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v13.Evc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Evc">
+            <xml-root-element name="evc"/>
+            <java-attributes>
+                <xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique/key field for the evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Point-to-Point, Multi-Point"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Commited Information Rate"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diversity Group ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="formerly Performance Group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="EVC Circuit ID of ESP EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Committed Information Rate (For ESP)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units (For ESP)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies ESP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Interconnect type on ingress side of EVC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagode for collector side of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagMode for network side of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="evc object is an optional child object of the Configuration object."/>
+                <xml-property name="dependentOn" value="configuration"/>
+                <xml-property name="uniqueProps" value="evc-id"/>
+                <xml-property name="container" value="evcs"/>
+                <xml-property name="uriTemplate" value="/evcs/evc/{evc-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Collections">
+            <xml-root-element name="collections"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="collection" name="collection" type="inventory.aai.onap.org.v13.Collection"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Collection">
+            <xml-root-element name="collection"/>
+            <java-attributes>
+                <xml-element java-attribute="collectionId" name="collection-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection Object UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model"/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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="Model Version"/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionName" name="collection-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="collection name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionType" name="collection-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionRole" name="collection-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection Role"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionFunction" name="collection-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection function"/>
+                    </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"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionCustomizationId" name="collection-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="description" value="represents the collection resource in the TOSCA model"/>
+                <xml-property name="uniqueProps" value="collection-id"/>
+                <xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id"/>
+                <xml-property name="container" value="collections"/>
+                <xml-property name="uriTemplate" value="/network/collections/collection/{collection-id}"/>
+            </xml-properties>
+        </java-type>
 
-	</java-types>
+    </java-types>
 </xml-bindings>
diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
index 1f0e81bf..a11298bf 100644
--- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
@@ -567,102 +567,102 @@
 			</xml-properties>
 		</java-type>
 
-		<java-type name="CloudInfrastructure">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for cloud infrastructure." />
-			</xml-properties>
-			<xml-root-element name="cloud-infrastructure" />
-			<java-attributes>
-				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v14.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v14.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v14.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v14.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v14.VirtualDataCenters" />
-				<xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v14.OperationalEnvironments" />
-			</java-attributes>
-		</java-type>
+        <java-type name="CloudInfrastructure">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for cloud infrastructure."/>
+            </xml-properties>
+            <xml-root-element name="cloud-infrastructure"/>
+            <java-attributes>
+                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v14.Complexes"/>
+                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v14.CloudRegions"/>
+                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v14.NetworkProfiles"/>
+                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v14.Pservers"/>
+                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v14.VirtualDataCenters"/>
+                <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v14.OperationalEnvironments"/>
+                <xml-element java-attribute="networkTechnologies" name="network-technologies" type="inventory.aai.onap.org.v14.NetworkTechnologies"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="CloudRegions">
-			<xml-root-element name="cloud-regions" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v14.CloudRegion" />
-			</java-attributes>
+        <java-type name="CloudRegions">
+            <xml-root-element name="cloud-regions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v14.CloudRegion"/>
+            </java-attributes>
             <xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="CloudRegion">
-			<xml-root-element name="cloud-region" />
-			<java-attributes>
-				<xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
+        <java-type name="CloudRegion">
+            <xml-root-element name="cloud-region"/>
+            <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-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the cloud (e.g., openstack)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL of the keystone identity service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the cloud (e.g., openstack)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." />
-					</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="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v14.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v14.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v14.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v14.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v14.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v14.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v14.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v14.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v14.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v14.VipIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v14.VipIpv6AddressList" />
+                    </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="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v14.VolumeGroups"/>
+                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v14.Tenants"/>
+                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v14.Flavors"/>
+                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v14.GroupAssignments"/>
+                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v14.Snapshots"/>
+                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v14.Images"/>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v14.DvsSwitches"/>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v14.OamNetworks"/>
+                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v14.AvailabilityZones"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v14.VipIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v14.VipIpv6AddressList"/>
 				<xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v14.HpaCapabilities">
 					<xml-properties>
 						<xml-property name="description" value="List of cloud-region specific HPA Capabilities"/>
@@ -670,1441 +670,1534 @@
 				</xml-element>
 				<xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v14.EsrSystemInfoList" />
             </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="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="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-		<java-type name="VolumeGroups">
-			<xml-properties>
-				<xml-property name="description" value="Collection of persistent block-level storage." />
-			</xml-properties>
-			<xml-root-element name="volume-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v14.VolumeGroup" />
-			</java-attributes>
-		</java-type>
+            <xml-properties>
+                <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="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="VolumeGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of persistent block-level storage."/>
+            </xml-properties>
+            <xml-root-element name="volume-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v14.VolumeGroup"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VolumeGroup">
-			<xml-root-element name="volume-group" />
-			<java-attributes>
-				<xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of volume-group." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the volume group." />
-					</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 volume-group" />
-					</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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this volume-group" />
-					</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="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-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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Persistent block-level storage." />
-				<xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" />
-				<xml-property name="searchable" value="volume-group-id,volume-group-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="volume-groups" />
-			</xml-properties>
-		</java-type>
+        <java-type name="VolumeGroup">
+            <xml-root-element name="volume-group"/>
+            <java-attributes>
+                <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of volume-group."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumeGroupName" name="volume-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the volume group."/>
+                    </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 volume-group"/>
+                    </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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this volume-group"/>
+                    </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="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-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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Persistent block-level storage."/>
+                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id"/>
+                <xml-property name="searchable" value="volume-group-id,volume-group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="volume-groups"/>
+                <xml-property name="uriTemplate" value="/volume-groups/volume-group/{volume-group-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="RelationshipList">
-			<xml-root-element name="relationship-list" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v14.Relationship" />
-			</java-attributes>
-		</java-type>
+        <java-type name="RelationshipList">
+            <xml-root-element name="relationship-list" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v14.Relationship" />
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Relationship">
-			<xml-root-element name="relationship" />
-			<java-attributes>
-				<xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The edge label for this relationship." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to the object in A&amp;AI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v14.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v14.RelatedToProperty" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Relationship">
+            <xml-root-element name="relationship" />
+            <java-attributes>
+                <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The edge label for this relationship." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to the object in A&amp;AI." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v14.RelationshipData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v14.RelatedToProperty" />
+            </java-attributes>
+        </java-type>
 
-		<java-type name="RelatedToProperty">
-			<xml-root-element name="related-to-property" />
-			<java-attributes>
-				<xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Key part of a key/value pair" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Value part of a key/value pair" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
+        <java-type name="RelatedToProperty">
+            <xml-root-element name="related-to-property" />
+            <java-attributes>
+                <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Key part of a key/value pair" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Value part of a key/value pair" />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="RelationshipData">
-			<xml-root-element name="relationship-data" />
-			<java-attributes>
-				<xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Value of the attribute." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
+        <java-type name="RelationshipData">
+            <xml-root-element name="relationship-data" />
+            <java-attributes>
+                <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Value of the attribute." />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
+        <java-type name="Complexes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+            </xml-properties>
+            <xml-root-element name="complexes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v14.Complex"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Complexes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-			</xml-properties>
-			<xml-root-element name="complexes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v14.Complex" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Complex">
+            <xml-root-element name="complex"/>
+            <java-attributes>
+                <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gamma complex name for LCP instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
+                    </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="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type, e.g., central office, data center."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="street2" name="street2" type="java.lang.String"/>
+                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="state" name="state" type="java.lang.String"/>
+                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"/>
+                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"/>
+                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"/>
+                <xml-element java-attribute="lata" name="lata" type="java.lang.String"/>
+                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v14.CtagPools"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id"/>
+                <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code"/>
+                <xml-property name="uniqueProps" value="physical-location-id"/>
+                <xml-property name="container" value="complexes"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/complexes/complex/{physical-location-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Complex">
-			<xml-root-element name="complex" />
-			<java-attributes>
-				<xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Data center code which can be an alternate way to identify a complex" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Gamma complex name for LCP instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL of the keystone identity service" />
-					</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="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type, e.g., central office, data center." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" />
-				<xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-				<xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-				<xml-element java-attribute="state" name="state" type="java.lang.String" />
-				<xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-				<xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-				<xml-element java-attribute="region" name="region" required="true" type="java.lang.String" />
-				<xml-element java-attribute="latitude" name="latitude" type="java.lang.String" />
-				<xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
-				<xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
-				<xml-element java-attribute="lata" name="lata" type="java.lang.String" />
-				<xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v14.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
-				<xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id" />
-				<xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code" />
-				<xml-property name="uniqueProps" value="physical-location-id" />
-				<xml-property name="container" value="complexes" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="CtagPools">
+            <xml-root-element name="ctag-pools"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v14.CtagPool"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="CtagPools">
-			<xml-root-element name="ctag-pools" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v14.CtagPool" />
-			</java-attributes>
-		</java-type>
+        <java-type name="CtagPool">
+            <xml-root-element name="ctag-pool"/>
+            <java-attributes>
+                <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="The Target provider edge router"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the availability zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes what the intended purpose of this pool is."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Comma separated list of ctags"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose."/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="ctag-pools"/>
+                <xml-property name="uriTemplate" value="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="CtagPool">
-			<xml-root-element name="ctag-pool" />
-			<java-attributes>
-				<xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="The Target provider edge router" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the availability zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Describes what the intended purpose of this pool is." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Comma separated list of ctags" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
-				<xml-property name="indexedProps" value="availability-zone-name" />
-				<xml-property name="dependentOn" value="complex" />
-				<xml-property name="container" value="ctag-pools" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Tenants">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack tenants."/>
+            </xml-properties>
+            <xml-root-element name="tenants"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v14.Tenant"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Tenants">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack tenants." />
-			</xml-properties>
-			<xml-root-element name="tenants" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v14.Tenant" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Tenant">
+            <xml-root-element name="tenant"/>
+            <java-attributes>
+                <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id relative to the cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Readable name of tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the tenant context."/>
+                    </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="vservers" name="vservers" type="inventory.aai.onap.org.v14.Vservers"/>
+                <xml-element java-attribute="nosServers" name="nos-servers" type="inventory.aai.onap.org.v14.NosServers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack tenant"/>
+                <xml-property name="nameProps" value="tenant-name"/>
+                <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context"/>
+                <xml-property name="searchable" value="tenant-id,tenant-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="tenants"/>
+                <xml-property name="uriTemplate" value="/tenants/tenant/{tenant-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Tenant">
-			<xml-root-element name="tenant" />
-			<java-attributes>
-				<xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id relative to the cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Readable name of tenant" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the tenant context." />
-					</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="vservers" name="vservers" type="inventory.aai.onap.org.v14.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack tenant" />
-				<xml-property name="nameProps" value="tenant-name" />
-				<xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context" />
-				<xml-property name="searchable" value="tenant-id,tenant-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="tenants" />
-			</xml-properties>
-		</java-type>
+        <java-type name="NosServers">
+            <xml-properties>
+                <xml-property name="description" value="nos-server is the execution environment that will have images, certain versions of VNOS, running on it."/>
+            </xml-properties>
+            <xml-root-element name="nos-servers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="nosServer" name="nos-server" type="inventory.aai.onap.org.v14.NosServer"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Vservers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." />
-			</xml-properties>
-			<xml-root-element name="vservers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v14.Vserver" />
-			</java-attributes>
-		</java-type>
+        <java-type name="NosServer">
+            <xml-root-element name="nos-server"/>
+            <java-attributes>
+                <xml-element java-attribute="nosServerId" name="nos-server-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for this nos relative to its tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nosServerName" name="nos-server-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of nos"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vendor" name="vendor" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="uCPE vendor"/>
+                    </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="nosServerSelflink" name="nos-server-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="nos-server is the execution environment that will have images, certain versions of VNOS, running on it."/>
+                <xml-property name="indexedProps" value="nos-server-id"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="nameProps" value="nos-server-name"/>
+                <xml-property name="container" value="nos-servers"/>
+                <xml-property name="uriTemplate" value="/nos-servers/nos-server/{nos-server-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vserver">
-			<xml-root-element name="vserver" />
-			<java-attributes>
-				<xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier for this vserver relative to its tenant" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of vserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternative name of vserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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="volumes" name="volumes" type="inventory.aai.onap.org.v14.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
-				<xml-property name="nameProps" value="vserver-name" />
-				<xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" />
-				<xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2" />
-				<xml-property name="dependentOn" value="tenant" />
-				<xml-property name="container" value="vservers" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs."/>
+            </xml-properties>
+            <xml-root-element name="vservers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v14.Vserver"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="LInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of logical interfaces." />
-			</xml-properties>
-			<xml-root-element name="l-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v14.LInterface" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Vserver">
+            <xml-root-element name="vserver"/>
+            <java-attributes>
+                <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternative name of vserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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). 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" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="volumes" name="volumes" type="inventory.aai.onap.org.v14.Volumes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
+                <xml-property name="nameProps" value="vserver-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2"/>
+                <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="container" value="vservers"/>
+                <xml-property name="uriTemplate" value="/vservers/vserver/{vserver-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="LInterface">
-			<xml-root-element name="l-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name given to the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="MAC address for the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<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 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 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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block." />
-					</xml-properties>
-				</xml-element>				
-				<xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v14.Vlans" />
-				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v14.SriovVfs" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Logical interfaces, e.g., a vnic." />
-				<xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
-				<xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
-				<xml-property name="container" value="l-interfaces" />
-			</xml-properties>
-		</java-type>
+        <java-type name="LInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="l-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v14.LInterface"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="SriovVfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of SR-IOV Virtual Functions." />
-			</xml-properties>
-			<xml-root-element name="sriov-vfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v14.SriovVf" />
-			</java-attributes>
-		</java-type>
-		<java-type name="SriovVf">
-			<xml-root-element name="sriov-vf" />
-			<java-attributes>
-				<xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="PCI ID used to identify the sriov-vf" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto." />
-					</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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
-				<xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" />
-				<xml-property name="dependentOn" value="l-interface" />
-				<xml-property name="container" value="sriov-vfs" />
-			</xml-properties>
-		</java-type>
+        <java-type name="LInterface">
+            <xml-root-element name="l-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name given to the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="MAC address for the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <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 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 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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v14.Vlans"/>
+                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v14.SriovVfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv6AddressList"/>
+                <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Administrative status of the interface. Valid values are 'up', 'down', or 'testing'."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
+                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name"/>
+                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface"/>
+                <xml-property name="container" value="l-interfaces"/>
+                <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="L3InterfaceIpv4AddressList">
-			<xml-root-element name="l3-interface-ipv4-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 32 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv4 Address Range" />
-				<xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
-			</xml-properties>
-		</java-type>
+        <java-type name="SriovVfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Virtual Functions."/>
+            </xml-properties>
+            <xml-root-element name="sriov-vfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v14.SriovVf"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovVf">
+            <xml-root-element name="sriov-vf"/>
+            <java-attributes>
+                <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="PCI ID used to identify the sriov-vf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
+                    </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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
+                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="sriov-vfs"/>
+                <xml-property name="uriTemplate" value="/sriov-vfs/sriov-vf/{pci-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vlans">
-			<xml-root-element name="vlans" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v14.Vlan" />
-			</java-attributes>
-		</java-type>
+        <java-type name="L3InterfaceIpv4AddressList">
+            <xml-root-element name="l3-interface-ipv4-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp"/>
+            <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vlan">
-			<xml-root-element name="vlan" />
-			<java-attributes>
-				<xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="String that identifies the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</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="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to describe (the service associated with) the vlan" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
-					<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 java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
-					</xml-properties>
-				</xml-element>			
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key" />
-				<xml-property name="dependentOn" value="l-interface" />
-				<xml-property name="container" value="vlans" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vlans">
+            <xml-root-element name="vlans"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v14.Vlan"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="L3InterfaceIpv6AddressList">
-			<xml-root-element name="l3-interface-ipv6-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 128 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv6 Address Range" />
-				<xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vlan">
+            <xml-root-element name="vlan"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="String that identifies the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </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="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to describe (the service associated with) the vlan"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
+                    <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 java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isPrivate" name="is-private" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Private VLAN indicator."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of vlan"/>
+                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="vlans"/>
+                <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Volumes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of ephemeral Block storage volumes." />
-			</xml-properties>
-			<xml-root-element name="volumes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v14.Volume" />
-			</java-attributes>
-		</java-type>
+        <java-type name="L3InterfaceIpv6AddressList">
+            <xml-root-element name="l3-interface-ipv6-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp"/>
+            <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Volume">
-			<xml-root-element name="volume" />
-			<java-attributes>
-				<xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of block storage volume relative to the vserver." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Ephemeral Block storage volume." />
-				<xml-property name="indexedProps" value="volume-id" />
-				<xml-property name="dependentOn" value="vserver" />
-				<xml-property name="container" value="volumes" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Volumes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of ephemeral Block storage volumes."/>
+            </xml-properties>
+            <xml-root-element name="volumes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v14.Volume"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Flavors">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack flavors." />
-			</xml-properties>
-			<xml-root-element name="flavors" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v14.Flavor" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Volume">
+            <xml-root-element name="volume"/>
+            <java-attributes>
+                <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Ephemeral Block storage volume."/>
+                <xml-property name="indexedProps" value="volume-id"/>
+                <xml-property name="dependentOn" value="vserver"/>
+                <xml-property name="container" value="volumes"/>
+                <xml-property name="uriTemplate" value="/volumes/volume/{volume-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Flavor">
-			<xml-root-element name="flavor" />
-			<java-attributes>
-				<xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Flavor id, expected to be unique across cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
-					<xml-properties>
+        <java-type name="Flavors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack flavors."/>
+            </xml-properties>
+            <xml-root-element name="flavors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v14.Flavor"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Flavor">
+            <xml-root-element name="flavor"/>
+            <java-attributes>
+                <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
+                    <xml-properties>
 						<xml-property name="description" value="Cloud Region Flavor name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Number of CPUs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Amount of memory" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Disk space" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Amount of ephemeral disk space" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="amount of swap space allocation" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" />
-					</xml-properties>
-				</xml-element>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of CPUs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Amount of memory"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Disk space"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Amount of ephemeral disk space"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="amount of swap space allocation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled"/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v14.HpaCapabilities">
 					<xml-properties>
 						<xml-property name="description" value="List of flavor specific HPA Capabilities"/>
 					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack flavor." />
-				<xml-property name="nameProps" value="flavor-name" />
-				<xml-property name="indexedProps" value="flavor-name,flavor-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<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-properties>
-			<xml-root-element name="snapshots" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v14.Snapshot" />
-			</java-attributes>		
-		</java-type>
-		
-		<java-type name="Snapshot">
-			<xml-root-element name="snapshot" />
-			<java-attributes>
-				<xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Snapshot name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operating system architecture" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The common name of the operating system distribution in lowercase" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The operating system version as specified by the distributor." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack snapshot" />
-				<xml-property name="nameProps" value="snapshot-name" />
-				<xml-property name="uniqueProps" value="snapshot-id" />
-				<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>	
-		</java-type>
-		
-		<java-type name="GroupAssignments">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack group assignments" />
-			</xml-properties>
-			<xml-root-element name="group-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v14.GroupAssignment" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="GroupAssignment">
-			<xml-root-element name="group-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Group id, expected to be unique across cloud-region." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group type - the type of group this instance refers to" />
-					</xml-properties>
-				</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-element>
-				<xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group description - description of the group" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
-				<xml-property name="nameProps" value="group-name" />
-				<xml-property name="indexedProps" value="group-id,group-type,group-name" />
-				<xml-property name="searchable" value="group-id,group-name"/>
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="group-assignments" />
-			</xml-properties>
-		</java-type>			
+                <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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack flavor."/>
+                <xml-property name="nameProps" value="flavor-name"/>
+                <xml-property name="indexedProps" value="flavor-name,flavor-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="flavors"/>
+                <xml-property name="uriTemplate" value="/flavors/flavor/{flavor-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Images">
-			<xml-properties>
-				<xml-property name="description" value="Collectio of Openstack images." />
-			</xml-properties>
-			<xml-root-element name="images" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v14.Image" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Snapshots">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack snapshots"/>
+            </xml-properties>
+            <xml-root-element name="snapshots"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v14.Snapshot"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Image">
-			<xml-root-element name="image" />
-			<java-attributes>
-				<xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Image id, expected to be unique across cloud region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Image name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operating system architecture." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The common name of the operating system distribution in lowercase" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The operating system version as specified by the distributor." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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.v14.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack image." />
-				<xml-property name="nameProps" value="image-name" />
-				<xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="images" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Snapshot">
+            <xml-root-element name="snapshot"/>
+            <java-attributes>
+                <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Snapshot name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system architecture"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack snapshot"/>
+                <xml-property name="nameProps" value="snapshot-name"/>
+                <xml-property name="uniqueProps" value="snapshot-id"/>
+                <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-property name="uriTemplate" value="/snapshots/snapshot/{snapshot-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Metadata">
-			<xml-properties>
-				<xml-property name="description" value="Collection of metadatum (key/value pairs)" />
-			</xml-properties>
-			<xml-root-element name="metadata" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v14.Metadatum" />
-			</java-attributes>
-		</java-type>
+        <java-type name="GroupAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack group assignments"/>
+            </xml-properties>
+            <xml-root-element name="group-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v14.GroupAssignment"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Metadatum">
-			<xml-root-element name="metadatum" />
-			<java-attributes>
-				<xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="metaval" name="metaval" required="true" 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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Key/value pairs" />
-				<xml-property name="indexedProps" value="metaname" />
-				<xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" />
-				<xml-property name="container" value="metadata" />
-			</xml-properties>
-		</java-type>
+        <java-type name="GroupAssignment">
+            <xml-root-element name="group-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Group id, expected to be unique across cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group type - the type of group this instance refers to"/>
+                    </xml-properties>
+                </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-element>
+                <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group description - description of the group"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)."/>
+                <xml-property name="nameProps" value="group-name"/>
+                <xml-property name="indexedProps" value="group-id,group-type,group-name"/>
+                <xml-property name="searchable" value="group-id,group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="group-assignments"/>
+                <xml-property name="uriTemplate" value="/group-assignments/group-assignment/{group-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="DvsSwitches">
-			<xml-properties>
-				<xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." />
-			</xml-properties>
-			<xml-root-element name="dvs-switches" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v14.DvsSwitch" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Images">
+            <xml-properties>
+                <xml-property name="description" value="Collectio of Openstack images."/>
+            </xml-properties>
+            <xml-root-element name="images"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v14.Image"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="DvsSwitch">
-			<xml-root-element name="dvs-switch" />
-			<java-attributes>
-				<xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="DVS switch name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL used to reach the vcenter" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
-				<xml-property name="indexedProps" value="vcenter-url,switch-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="dvs-switches" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Image">
+            <xml-root-element name="image"/>
+            <java-attributes>
+                <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Image id, expected to be unique across cloud region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Image name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operating system architecture."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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.v14.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack image."/>
+                <xml-property name="nameProps" value="image-name"/>
+                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="images"/>
+                <xml-property name="uriTemplate" value="/images/image/{image-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="NetworkProfiles">
-			<xml-properties>
-				<xml-property name="description" value="Collection of network profiles" />
-			</xml-properties>
-			<xml-root-element name="network-profiles" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v14.NetworkProfile" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Metadata">
+            <xml-properties>
+                <xml-property name="description" value="Collection of metadatum (key/value pairs)"/>
+            </xml-properties>
+            <xml-root-element name="metadata"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v14.Metadatum"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Metadatum">
+            <xml-root-element name="metadatum"/>
+            <java-attributes>
+                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="metaval" name="metaval" required="true" 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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Key/value pairs"/>
+                <xml-property name="indexedProps" value="metaname"/>
+                <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model"/>
+                <xml-property name="container" value="metadata"/>
+                <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="NetworkProfile">
-			<xml-root-element name="network-profile" />
-			<java-attributes>
-				<xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique name of network profile." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encrypted SNMP community string" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
-				<xml-property name="indexedProps" value="nm-profile-name" />
-				<xml-property name="container" value="network-profiles" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="DvsSwitches">
+            <xml-properties>
+                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs."/>
+            </xml-properties>
+            <xml-root-element name="dvs-switches"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v14.DvsSwitch"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Pservers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of compute hosts." />
-			</xml-properties>
-			<xml-root-element name="pservers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v14.Pserver" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="DvsSwitch">
+            <xml-root-element name="dvs-switch"/>
+            <java-attributes>
+                <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS switch name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL used to reach the vcenter"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
+                <xml-property name="indexedProps" value="vcenter-url,switch-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="dvs-switches"/>
+                <xml-property name="uriTemplate" value="/dvs-switches/dvs-switch/{switch-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Pserver">
-			<xml-root-element name="pserver" />
-			<java-attributes>
-				<xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Value from executing hostname on the compute node." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="PTNII name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Number of cpus" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Disk size, in GBs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="RAM size, in MBs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Fully-qualified domain name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Serial number, may be queried" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 OAM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of Pserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="internet topology of Pserver" />
-					</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 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="pserverName2" name="pserver-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="alternative pserver name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="purpose of pserver" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates who owns and or manages the device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The host profile that defines the configuration of the pserver." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v14.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
-				<xml-property name="nameProps" value="pserver-name2" />
-				<xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status" />
-				<xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" />
-				<xml-property name="container" value="pservers" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="NetworkProfiles">
+            <xml-properties>
+                <xml-property name="description" value="Collection of network profiles"/>
+            </xml-properties>
+            <xml-root-element name="network-profiles"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v14.NetworkProfile"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="PInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical interfaces." />
-			</xml-properties>
-			<xml-root-element name="p-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v14.PInterface" />
-			</java-attributes>
-		</java-type>
+        <java-type name="NetworkProfile">
+            <xml-root-element name="network-profile"/>
+            <java-attributes>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique name of network profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted SNMP community string"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Network profile populated by SDN-GP for SNMP"/>
+                <xml-property name="indexedProps" value="nm-profile-name"/>
+                <xml-property name="container" value="network-profiles"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="PInterface">
-			<xml-root-element name="p-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name that identifies the physical interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Nature of the services and connectivity on this port." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CLEI or other specification for p-interface hardware." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role specification for p-interface hardware." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the physical properties of the interface." />
-					</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>
+        <java-type name="Pservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of compute hosts."/>
+            </xml-properties>
+            <xml-root-element name="pservers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v14.Pserver"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pserver">
+            <xml-root-element name="pserver"/>
+            <java-attributes>
+                <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value from executing hostname on the compute node."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="PTNII name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Number of cpus"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Disk size, in GBs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="RAM size, in MBs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Fully-qualified domain name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number, may be queried"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of Pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="internet topology of Pserver"/>
+                    </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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </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="pserverName2" name="pserver-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="alternative pserver name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="purpose of pserver"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates who owns and or manages the device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The host profile that defines the configuration of the pserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v14.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
+                <xml-property name="nameProps" value="pserver-name2"/>
+                <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status"/>
+                <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address"/>
+                <xml-property name="uniqueProps" value="hostname"/>
+                <xml-property name="container" value="pservers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/pservers/pserver/{hostname}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="p-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v14.PInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PInterface">
+            <xml-root-element name="p-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the physical interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nature of the services and connectivity on this port."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role specification for p-interface hardware."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
+                    </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="macAddress" name="mac-addresss" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="MAC Address of the p-interface." />
 					</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="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="inventory status" />
-					</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="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="inventory status"/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="networkRef" name="network-ref" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point." />
@@ -2120,587 +2213,592 @@
 						<xml-property name="description" value="oper Status of this p-interface." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v14.SriovPfs" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Physical interface (e.g., nic)" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v14.SriovPfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Physical interface (e.g., nic)"/>
 				<xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status" />
-				<xml-property name="nameProps" value="prov-status" />
-				<xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
-				<xml-property name="container" value="p-interfaces" />
-			</xml-properties>
-		</java-type>
+                <xml-property name="nameProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
+                <xml-property name="container" value="p-interfaces"/>
+                <xml-property name="uriTemplate" value="/p-interfaces/p-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="LagInterfaces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of link aggregate interfaces." />
-			</xml-properties>
-			<xml-root-element name="lag-interfaces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v14.LagInterface" />
-			</java-attributes>
-		</java-type>
+        <java-type name="LagInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregate interfaces."/>
+            </xml-properties>
+            <xml-root-element name="lag-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v14.LagInterface"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="LagInterface">
-			<xml-root-element name="lag-interface" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name that identifies the link aggregate interface" />
-					</xml-properties>
-				</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 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="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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 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.v14.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Link aggregate interface" />
-				<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>
+        <java-type name="LagInterface">
+            <xml-root-element name="lag-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the link aggregate interface"/>
+                    </xml-properties>
+                </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 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="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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 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.v14.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Link aggregate interface"/>
+                <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-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="OamNetworks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. " />
-			</xml-properties>
-			<xml-root-element name="oam-networks" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v14.OamNetwork" />
-			</java-attributes>
-		</java-type>
+        <java-type name="OamNetworks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. "/>
+            </xml-properties>
+            <xml-root-element name="oam-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v14.OamNetwork"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="OamNetwork">
-			<xml-root-element name="oam-network" />
-			<java-attributes>
-				<xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of the network. Unique across a cloud-region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="cvlan-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
-				<xml-property name="nameProps" value="network-name" />
-				<xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="oam-networks" />
-			</xml-properties>
-		</java-type>
+        <java-type name="OamNetwork">
+            <xml-root-element name="oam-network"/>
+            <java-attributes>
+                <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="cvlan-id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="oam-networks"/>
+                <xml-property name="uriTemplate" value="/oam-networks/oam-network/{network-uuid}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="AvailabilityZones">
-			<xml-properties>
-				<xml-property name="description" value="Collection of availability zones" />
-			</xml-properties>
-			<xml-root-element name="availability-zones" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v14.AvailabilityZone" />
-			</java-attributes>
-		</java-type>
+        <java-type name="AvailabilityZones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of availability zones"/>
+            </xml-properties>
+            <xml-root-element name="availability-zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v14.AvailabilityZone"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="AvailabilityZone">
-			<xml-root-element name="availability-zone" />
-			<java-attributes>
-				<xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the availability zone.  Unique across a cloud region" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
-				<xml-property name="indexedProps" value="availability-zone-name" />
-				<xml-property name="dependentOn" value="cloud-region" />
-				<xml-property name="container" value="availability-zones" />
-			</xml-properties>
-		</java-type>
+        <java-type name="AvailabilityZone">
+            <xml-root-element name="availability-zone"/>
+            <java-attributes>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers"/>
+                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="availability-zones"/>
+                <xml-property name="uriTemplate" value="/availability-zones/availability-zone/{availability-zone-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VirtualDataCenters">
-			<xml-properties>
-				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-			</xml-properties>
-			<xml-root-element name="virtual-data-centers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v14.VirtualDataCenter" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VirtualDataCenters">
+            <xml-properties>
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+            </xml-properties>
+            <xml-root-element name="virtual-data-centers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v14.VirtualDataCenter"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VirtualDataCenter">
-			<xml-root-element name="virtual-data-center" />
-			<java-attributes>
-				<xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of the vdc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the virtual data center" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
-				<xml-property name="nameProps" value="vdc-name" />
-				<xml-property name="indexedProps" value="vdc-name,vdc-id" />
-				<xml-property name="container" value="virtual-data-centers" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
+        <java-type name="VirtualDataCenter">
+            <xml-root-element name="virtual-data-center"/>
+            <java-attributes>
+                <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the vdc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the virtual data center"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+                <xml-property name="nameProps" value="vdc-name"/>
+                <xml-property name="indexedProps" value="vdc-name,vdc-id"/>
+                <xml-property name="container" value="virtual-data-centers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Business">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for business related constructs" />
-			</xml-properties>
-			<xml-root-element name="business" />
-			<java-attributes>
-				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v14.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v14.Customers" />
-				<xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v14.LinesOfBusiness" />
-				<xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v14.OwningEntities" />
-				<xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v14.Platforms" />
-				<xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v14.Projects" />
+        <java-type name="Business">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for business related constructs"/>
+            </xml-properties>
+            <xml-root-element name="business"/>
+            <java-attributes>
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v14.Connectors"/>
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v14.Customers"/>
+                <xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v14.LinesOfBusiness"/>
+                <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v14.OwningEntities"/>
+                <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v14.Platforms"/>
+                <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v14.Projects"/>
 
 				<xml-element java-attribute="spPartners" name="sp-partners" type="inventory.aai.onap.org.v14.SpPartners" />
-			</java-attributes>
-		</java-type>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Projects">
-			<xml-properties>
-				<xml-property name="description" value="Collection of projects" />
-			</xml-properties>
-			<xml-root-element name="projects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v14.Project" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Projects">
+            <xml-properties>
+                <xml-property name="description" value="Collection of projects"/>
+            </xml-properties>
+            <xml-root-element name="projects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v14.Project"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Project">
-			<xml-root-element name="project" />
-			<java-attributes>
-				<xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the project deploying a service" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes the project" />
-				<xml-property name="indexedProps" value="project-name" />
-				<xml-property name="uniqueProps" value="project-name" />
-				<xml-property name="container" value="projects" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Project">
+            <xml-root-element name="project"/>
+            <java-attributes>
+                <xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the project deploying a service"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes the project"/>
+                <xml-property name="indexedProps" value="project-name"/>
+                <xml-property name="uniqueProps" value="project-name"/>
+                <xml-property name="container" value="projects"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/projects/project/{project-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Connectors">
-			<xml-properties>
-				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
-			</xml-properties>
-			<xml-root-element name="connectors" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v14.Connector" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Connectors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
+            </xml-properties>
+            <xml-root-element name="connectors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v14.Connector"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Connector">
-			<xml-root-element name="connector" />
-			<java-attributes>
-				<xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of resource instance." />
-					</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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata" />
-			</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,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>
-		</java-type>
+        <java-type name="Connector">
+            <xml-root-element name="connector"/>
+            <java-attributes>
+                <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of resource instance."/>
+                    </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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata"/>
+            </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,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-property name="uriTemplate" value="/business/connectors/connector/{resource-instance-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Customers">
-			<xml-properties>
-				<xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." />
-			</xml-properties>
-			<xml-root-element name="customers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v14.Customer" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Customers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
+            </xml-properties>
+            <xml-root-element name="customers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v14.Customer"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Customer">
-			<xml-root-element name="customer" />
-			<java-attributes>
-				<xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." />
-						<xml-property name="defaultValue" value="CUST" />
-					</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="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v14.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
-				<xml-property name="nameProps" value="subscriber-name" />
-				<xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
-				<xml-property name="searchable" value="global-customer-id,subscriber-name" />
-				<xml-property name="uniqueProps" value="global-customer-id" />
-				<xml-property name="container" value="customers" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="LinesOfBusiness">
-			<xml-properties>
-				<xml-property name="description" value="Collection of lines-of-business" />
-			</xml-properties>
-			<xml-root-element name="lines-of-business" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v14.LineOfBusiness" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="LineOfBusiness">
-			<xml-root-element name="line-of-business" />
-			<java-attributes>
-				<xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the line-of-business (product)" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes a line-of-business" />
-				<xml-property name="indexedProps" value="line-of-business-name" />
-				<xml-property name="uniqueProps" value="line-of-business-name" />
-				<xml-property name="container" value="lines-of-business" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="OwningEntities">
-			<xml-properties>
-				<xml-property name="description" value="Collection of owning-entities" />
-			</xml-properties>
-			<xml-root-element name="owning-entities" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v14.OwningEntity" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="OwningEntity">
-			<xml-root-element name="owning-entity" />
-			<java-attributes>
-				<xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of an owning entity" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Owning entity name" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes an owning-entity" />
-				<xml-property name="indexedProps" value="owning-entity-id, owning-entity-name" />
-				<xml-property name="searchable" value="owning-entity-id" />
-				<xml-property name="uniqueProps" value="owning-entity-id, owning-entity-name" />
-				<xml-property name="container" value="owning-entities" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="Platforms">
-			<xml-properties>
-				<xml-property name="description" value="Collection of platforms" />
-			</xml-properties>
-			<xml-root-element name="platforms" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v14.Platform" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="Platform">
-			<xml-root-element name="platform" />
-			<java-attributes>
-				<xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Name of the platform" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="describes a platform" />
-				<xml-property name="indexedProps" value="platform-name" />
-				<xml-property name="uniqueProps" value="platform-name" />
-				<xml-property name="container" value="platforms" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="ServiceSubscriptions">
-			<xml-properties>
-				<xml-property name="description" value="Collection of objects that group service instances." />
-			</xml-properties>
-			<xml-root-element name="service-subscriptions" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v14.ServiceSubscription" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Customer">
+            <xml-root-element name="customer"/>
+            <java-attributes>
+                <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers."/>
+                        <xml-property name="defaultValue" value="CUST"/>
+                    </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="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v14.ServiceSubscriptions"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
+                <xml-property name="nameProps" value="subscriber-name"/>
+                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type"/>
+                <xml-property name="searchable" value="global-customer-id,subscriber-name"/>
+                <xml-property name="uniqueProps" value="global-customer-id"/>
+                <xml-property name="container" value="customers"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/customers/customer/{global-customer-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceSubscription">
-			<xml-root-element name="service-subscription" />
-			<java-attributes>
-				<xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+        <java-type name="LinesOfBusiness">
+            <xml-properties>
+                <xml-property name="description" value="Collection of lines-of-business"/>
+            </xml-properties>
+            <xml-root-element name="lines-of-business"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v14.LineOfBusiness"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LineOfBusiness">
+            <xml-root-element name="line-of-business"/>
+            <java-attributes>
+                <xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution." />
+                        <xml-property name="description" value="Name of the line-of-business (product)"/>
                     </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="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v14.ServiceInstances">
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Object that group service instances." />
-				<xml-property name="indexedProps" value="service-type" />
-				<xml-property name="dependentOn" value="customer" />
-				<xml-property name="container" value="service-subscriptions" />
-				<xml-property name="crossEntityReference" value="service-instance,service-type" />
-			</xml-properties>
-		</java-type>
+                <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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a line-of-business"/>
+                <xml-property name="indexedProps" value="line-of-business-name"/>
+                <xml-property name="uniqueProps" value="line-of-business-name"/>
+                <xml-property name="container" value="lines-of-business"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/lines-of-business/line-of-business/{line-of-business-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceInstances">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service instances" />
-			</xml-properties>
-			<xml-root-element name="service-instances" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v14.ServiceInstance" />
-			</java-attributes>
-		</java-type>
+        <java-type name="OwningEntities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of owning-entities"/>
+            </xml-properties>
+            <xml-root-element name="owning-entities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v14.OwningEntity"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ServiceInstance">
-			<xml-root-element name="service-instance" />
-			<java-attributes>
-				<xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this instance of a service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
-					<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="serviceType" name="service-type" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="String capturing type of service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="String capturing the service role." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the environment context assigned to the service-instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This field will store the workload context assigned to the service-instance." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="OwningEntity">
+            <xml-root-element name="owning-entity"/>
+            <java-attributes>
+                <xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an owning entity"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Owning entity name"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an owning-entity"/>
+                <xml-property name="indexedProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="searchable" value="owning-entity-id"/>
+                <xml-property name="uniqueProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="container" value="owning-entities"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/owning-entities/owning-entity/{owning-entity-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Platforms">
+            <xml-properties>
+                <xml-property name="description" value="Collection of platforms"/>
+            </xml-properties>
+            <xml-root-element name="platforms"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v14.Platform"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Platform">
+            <xml-root-element name="platform"/>
+            <java-attributes>
+                <xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the platform"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a platform"/>
+                <xml-property name="indexedProps" value="platform-name"/>
+                <xml-property name="uniqueProps" value="platform-name"/>
+                <xml-property name="container" value="platforms"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/platforms/platform/{platform-name}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceSubscriptions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of objects that group service instances."/>
+            </xml-properties>
+            <xml-root-element name="service-subscriptions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v14.ServiceSubscription"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceSubscription">
+            <xml-root-element name="service-subscription"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
+                    </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="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v14.ServiceInstances">
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Object that group service instances."/>
+                <xml-property name="indexedProps" value="service-type"/>
+                <xml-property name="dependentOn" value="customer"/>
+                <xml-property name="container" value="service-subscriptions"/>
+                <xml-property name="crossEntityReference" value="service-instance,service-type"/>
+                <xml-property name="uriTemplate" value="/service-subscriptions/service-subscription/{service-type}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceInstances">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service instances"/>
+            </xml-properties>
+            <xml-root-element name="service-instances"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v14.ServiceInstance"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceInstance">
+            <xml-root-element name="service-instance"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this instance of a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
+                    <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="serviceType" name="service-type" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing the service role."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the environment context assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the workload context assigned to the service-instance."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="createdAt" name="created-at" required="false" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="create time of Network Service." />
@@ -2718,751 +2816,739 @@
                 </xml-element>
                 <!-- for storing the nsd_id create edge between services -->
                 <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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL customers will use to access the vHN Portal." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
-					</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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this service." />
-					</xml-properties>
-				</xml-element>
+                    <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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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">
+                    <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="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL customers will use to access the vHN Portal."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used."/>
+                    </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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this service."/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="inputParameters" name="input-parameters" required="false" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="String capturing request parameters from SO to pass to Closed Loop." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata" />
-				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v14.AllottedResources" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Instance of a service" />
-				<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,environment-context,workload-context" />
-				<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" />
-				<xml-property name="dependentOn" value="service-subscription" />
-				<xml-property name="container" value="service-instances" />
-			</xml-properties>
-		</java-type>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata"/>
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v14.AllottedResources"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a service"/>
+                <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,environment-context,workload-context"/>
+                <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"/>
+                <xml-property name="dependentOn" value="service-subscription"/>
+                <xml-property name="container" value="service-instances"/>
+                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceDesignAndCreation">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for objects managed by ASDC" />
-			</xml-properties>
-			<xml-root-element name="service-design-and-creation" />
-			<java-attributes>
-				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v14.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v14.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v14.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v14.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v14.NamedQueries" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ServiceDesignAndCreation">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for objects managed by ASDC"/>
+            </xml-properties>
+            <xml-root-element name="service-design-and-creation"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v14.VnfImages"/>
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v14.Services"/>
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v14.ServiceCapabilities"/>
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v14.Models"/>
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v14.NamedQueries"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VnfImages">
-			<xml-properties>
-				<xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
-			</xml-properties>
-			<xml-root-element name="vnf-images" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v14.VnfImage" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VnfImages">
+            <xml-properties>
+                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+            </xml-properties>
+            <xml-root-element name="vnf-images"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v14.VnfImage"/>
+            </java-attributes>
+        </java-type>
 
-		<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-properties>
-						<xml-property name="description" value="Unique ID of this asset" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The application that the image instantiates." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The vendor of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The version of the application." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
-				<xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" />
-				<xml-property name="uniqueProps" value="vnf-image-uuid" />
-				<xml-property name="container" value="vnf-images" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
+        <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-properties>
+                        <xml-property name="description" value="Unique ID of this asset"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version"/>
+                <xml-property name="uniqueProps" value="vnf-image-uuid"/>
+                <xml-property name="container" value="vnf-images"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Services">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC." />
-			</xml-properties>
-			<xml-root-element name="services" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v14.Service" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Services">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
+            </xml-properties>
+            <xml-root-element name="services"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v14.Service"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Service">
-			<xml-root-element name="service" />
-			<java-attributes>
-				<xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description of the service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
-					</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="serviceVersion" name="service-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="service version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
-				<xml-property name="indexedProps" value="service-description,service-id" />
-				<xml-property name="container" value="services" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Service">
+            <xml-root-element name="service"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of the service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                    </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="serviceVersion" name="service-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="service version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services."/>
+                <xml-property name="indexedProps" value="service-description,service-id"/>
+                <xml-property name="container" value="services"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/services/service/{service-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ServiceCapabilities">
-			<xml-properties>
-				<xml-property name="description" value="Collection of service capabilities." />
-			</xml-properties>
-			<xml-root-element name="service-capabilities" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v14.ServiceCapability" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ServiceCapabilities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service capabilities."/>
+            </xml-properties>
+            <xml-root-element name="service-capabilities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v14.ServiceCapability"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ServiceCapability">
-			<xml-root-element name="service-capability" />
-			<java-attributes>
-				<xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="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="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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
-				<xml-property name="indexedProps" value="service-type,vnf-type" />
-				<xml-property name="container" value="service-capabilities" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-		</java-type>
+        <java-type name="ServiceCapability">
+            <xml-root-element name="service-capability"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="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="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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
+                <xml-property name="indexedProps" value="service-type,vnf-type"/>
+                <xml-property name="container" value="service-capabilities"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Network">
-			<xml-properties>
-				<xml-property name="description" value="Namespace for network inventory resources." />
-			</xml-properties>
-			<xml-root-element name="network" />
-			<java-attributes>
-				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v14.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v14.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v14.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v14.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v14.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v14.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v14.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v14.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v14.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v14.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v14.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v14.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v14.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v14.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v14.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v14.RouteTableReferences" />
-				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v14.InstanceGroups" />
-				<xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v14.Zones" />
-				<xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v14.Configurations" />
-				<xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v14.ForwardingPaths" />
-				<xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v14.Collections" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Network">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for network inventory resources."/>
+            </xml-properties>
+            <xml-root-element name="network"/>
+            <java-attributes>
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v14.LogicalLinks"/>
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v14.SitePairSets"/>
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v14.VpnBindings"/>
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v14.VplsPes"/>
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v14.MulticastConfigurations"/>
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v14.Vces"/>
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v14.Vnfcs"/>
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v14.L3Networks"/>
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v14.NetworkPolicies"/>
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v14.GenericVnfs"/>
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v14.LagLinks"/>
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v14.Newvces"/>
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v14.Pnfs"/>
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v14.PhysicalLinks"/>
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v14.IpsecConfigurations"/>
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v14.RouteTableReferences"/>
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v14.InstanceGroups"/>
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v14.Zones"/>
+                <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v14.Configurations"/>
+                <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v14.ForwardingPaths"/>
+                <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v14.Collections"/>
+                <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v14.VlanTags"/>
+            </java-attributes>
+        </java-type>
         <java-type name="Configurations">
-			<xml-properties>
-				<xml-property name="description" value="Collection of configurations" />
-			</xml-properties>
-			<xml-root-element name="configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v14.Configuration" />
-			</java-attributes>
-		</java-type>
+            <xml-properties>
+                <xml-property name="description" value="Collection of configurations"/>
+            </xml-properties>
+            <xml-root-element name="configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v14.Configuration"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Configuration">
-			<xml-root-element name="configuration" />
-			<java-attributes>
-				<xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID assigned to configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="port-mirroring-configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationSubType" name="configuration-sub-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="vprobe, pprobe." />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of the configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id of  the configuration used to customize the resource" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="DHV Site Effective Bandwidth" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Velocloud Nominal Throughput - VNT" />
-					</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.v14.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata" />
-				<xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v14.ForwarderEvcs" />
-				<xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v14.Evcs" />
-			</java-attributes>
-			<xml-properties>
-                <xml-property name="description" value="Port Mirror Configuration." />
-				<xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" />
-				<xml-property name="uniqueProps" value="configuration-id" />
-				<xml-property name="container" value="configurations" />
-				<xml-property name="namespace" value="network" />
-                <xml-property name="nameProps" value="configuration-type" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Configuration">
+            <xml-root-element name="configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID assigned to configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="port-mirroring-configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSubType" name="configuration-sub-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vprobe, pprobe."/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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 the configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSelflink" name="configuration-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of  the configuration used to customize the resource"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DHV Site Effective Bandwidth"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Velocloud Nominal Throughput - VNT"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configPolicyName" name="config-policy-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to capture the name of the fabric configuration policy that was used to generate the payload sent to PINC for fabric configuration."/>
+                    </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.v14.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata"/>
+                <xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v14.ForwarderEvcs"/>
+                <xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v14.Evcs"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic configuration object."/>
+                <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id"/>
+                <xml-property name="uniqueProps" value="configuration-id"/>
+                <xml-property name="container" value="configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/configurations/configuration/{configuration-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="LogicalLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of logical connections" />
-			</xml-properties>
-			<xml-root-element name="logical-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v14.LogicalLink" />
-			</java-attributes>
-		</java-type>
+        <java-type name="LogicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical connections"/>
+            </xml-properties>
+            <xml-root-element name="logical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v14.LogicalLink"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="LogicalLink">
-			<xml-root-element name="logical-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element 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 java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of logical link, e.g., evc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
+        <java-type name="LogicalLink">
+            <xml-root-element name="logical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element 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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of logical link, e.g., evc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
 						<xml-property name="description" value="v4, v6, or ds for dual stack" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="For example, static or BGP" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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">
-					<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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indication of operational status of the logical link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indication of the network use of the logical link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
-					</xml-properties>
-				</xml-element>
-					<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Reason for this entity, role it is playing" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="For example, static or BGP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of operational status of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of the network use of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Reason for this entity, role it is playing"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/>
 				<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,operational-status" />
-				<xml-property name="uniqueProps" value="link-id" />
-				<xml-property name="container" value="logical-links" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="searchable" value="link-name" />
-			</xml-properties>
-		</java-type>
+                <xml-property name="uniqueProps" value="link-id"/>
+                <xml-property name="container" value="logical-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="searchable" value="link-name"/>
+                <xml-property name="uriTemplate" value="/network/logical-links/logical-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="SitePairSets">
-			<xml-properties>
-				<xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" />
-			</xml-properties>
-			<xml-root-element name="site-pair-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v14.SitePairSet" />
-			</java-attributes>
-		</java-type>
+        <java-type name="SitePairSets">
+            <xml-properties>
+                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf"/>
+            </xml-properties>
+            <xml-root-element name="site-pair-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v14.SitePairSet"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="SitePairSet">
-			<xml-root-element name="site-pair-set" />
-			<java-attributes>
-				<xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of site pair set." />
-					</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="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v14.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
-				<xml-property name="indexedProps" value="site-pair-set-id" />
-				<xml-property name="uniqueProps" value="site-pair-set-id" />
-				<xml-property name="container" value="site-pair-sets" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="SitePairSet">
+            <xml-root-element name="site-pair-set"/>
+            <java-attributes>
+                <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of site pair set."/>
+                    </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="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v14.RoutingInstances"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
+                <xml-property name="indexedProps" value="site-pair-set-id"/>
+                <xml-property name="uniqueProps" value="site-pair-set-id"/>
+                <xml-property name="container" value="site-pair-sets"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/site-pair-sets/site-pair-set/{site-pair-set-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="RoutingInstances">
-			<xml-properties>
-				<xml-property name="description" value="set of probes related to generic-vnf routing instance" />
-			</xml-properties>
-			<xml-root-element name="routing-instances" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v14.RoutingInstance" />
-			</java-attributes>
-		</java-type>
+        <java-type name="RoutingInstances">
+            <xml-properties>
+                <xml-property name="description" value="set of probes related to generic-vnf routing instance"/>
+            </xml-properties>
+            <xml-root-element name="routing-instances"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v14.RoutingInstance"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="RoutingInstance">
-			<xml-root-element name="routing-instance" />
-			<java-attributes>
-				<xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of routing instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="rpm owner" />
-					</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="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v14.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="routing-instance-id" />
-				<xml-property name="dependentOn" value="site-pair-set" />
-				<xml-property name="container" value="routing-instances" />
-			</xml-properties>
-		</java-type>
+        <java-type name="RoutingInstance">
+            <xml-root-element name="routing-instance"/>
+            <java-attributes>
+                <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of routing instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rpm owner"/>
+                    </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="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v14.SitePairs"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="routing-instance-id"/>
+                <xml-property name="dependentOn" value="site-pair-set"/>
+                <xml-property name="container" value="routing-instances"/>
+                <xml-property name="uriTemplate" value="/routing-instances/routing-instance/{routing-instance-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="SitePairs">
-			<xml-properties>
-				<xml-property name="description" value="probe within a set" />
-			</xml-properties>
-			<xml-root-element name="site-pairs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v14.SitePair" />
-			</java-attributes>
-		</java-type>
+        <java-type name="SitePairs">
+            <xml-properties>
+                <xml-property name="description" value="probe within a set"/>
+            </xml-properties>
+            <xml-root-element name="site-pairs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v14.SitePair"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="SitePair">
-			<xml-root-element name="site-pair" />
-			<java-attributes>
-				<xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prefix address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prefix address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip version, v4, v6" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." />
-					</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="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v14.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="site-pair-id" />
-				<xml-property name="uniqueProps" value="site-pair-id" />
-				<xml-property name="dependentOn" value="routing-instance" />
-				<xml-property name="container" value="site-pairs" />
-			</xml-properties>
-		</java-type>
+        <java-type name="SitePair">
+            <xml-root-element name="site-pair"/>
+            <java-attributes>
+                <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version, v4, v6"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc."/>
+                    </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="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v14.ClassesOfService"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="site-pair-id"/>
+                <xml-property name="uniqueProps" value="site-pair-id"/>
+                <xml-property name="dependentOn" value="routing-instance"/>
+                <xml-property name="container" value="site-pairs"/>
+                <xml-property name="uriTemplate" value="/site-pairs/site-pair/{site-pair-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="ClassesOfService">
-			<xml-properties>
-				<xml-property name="description" value="class-of-service of probe" />
-			</xml-properties>
-			<xml-root-element name="classes-of-service" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v14.ClassOfService" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ClassesOfService">
+            <xml-properties>
+                <xml-property name="description" value="class-of-service of probe"/>
+            </xml-properties>
+            <xml-root-element name="classes-of-service"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v14.ClassOfService"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ClassOfService">
-			<xml-root-element name="class-of-service" />
-			<java-attributes>
-				<xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="identifier of probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="type of probe" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="cos" />
-				<xml-property name="dependentOn" value="site-pair" />
-				<xml-property name="container" value="classes-of-service" />
-			</xml-properties>
-		</java-type>
+        <java-type name="ClassOfService">
+            <xml-root-element name="class-of-service"/>
+            <java-attributes>
+                <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifier of probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type of probe"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="cos"/>
+                <xml-property name="dependentOn" value="site-pair"/>
+                <xml-property name="container" value="classes-of-service"/>
+                <xml-property name="uriTemplate" value="/classes-of-service/class-of-service/{cos}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VpnBindings">
-			<xml-root-element name="vpn-bindings" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v14.VpnBinding" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VpnBindings">
+            <xml-root-element name="vpn-bindings"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v14.VpnBinding"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VpnBinding">
-			<xml-root-element name="vpn-binding" />
-			<java-attributes>
-				<xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="VPN ID, globally unique within A&amp;AI" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="VPN Name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="region of customer vpn" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id for this customer vpn" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="VpnBinding">
+            <xml-root-element name="vpn-binding"/>
+            <java-attributes>
+                <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN Name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="region of customer vpn"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id for this customer vpn"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network."/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Store the id of the access provider of this vpn." />
@@ -3518,865 +3604,887 @@
 						<xml-property name="description" value="Store the model-invariant-id for this object." />
 					</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="routeTargets" name="route-targets" type="inventory.aai.onap.org.v14.RouteTargets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList">
-					<xml-properties>
-						<xml-property name="description" value="l3-networks relate to vpn-bindings" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="VPN binding" />
-				<xml-property name="nameProps" value="vpn-name,vpn-type" />
+                <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="routeTargets" name="route-targets" type="inventory.aai.onap.org.v14.RouteTargets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList">
+                    <xml-properties>
+                        <xml-property name="description" value="l3-networks relate to vpn-bindings"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPN binding"/>
+                <xml-property name="nameProps" value="vpn-name,vpn-type"/>
 				<xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status" />
-				<xml-property name="searchable" value="vpn-id,vpn-name" />
-				<xml-property name="uniqueProps" value="vpn-id" />
-				<xml-property name="container" value="vpn-bindings" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VplsPes">
-			<xml-properties>
-				<xml-property name="description" value="Collection of VPLS Provider Edge routers" />
-			</xml-properties>
-			<xml-root-element name="vpls-pes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v14.VplsPe" />
-			</java-attributes>
-		</java-type>
+                <xml-property name="searchable" value="vpn-id,vpn-name"/>
+                <xml-property name="uniqueProps" value="vpn-id"/>
+                <xml-property name="container" value="vpn-bindings"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpn-bindings/vpn-binding/{vpn-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VplsPe">
-			<xml-root-element name="vpls-pe" />
-			<java-attributes>
-				<xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Temporary location for stag to get to VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v14.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v14.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="VPLS Provider Edge routers." />
-				<xml-property name="indexedProps" value="prov-status,equipment-name" />
-				<xml-property name="container" value="vpls-pes" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="VplsPes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VPLS Provider Edge routers"/>
+            </xml-properties>
+            <xml-root-element name="vpls-pes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v14.VplsPe"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="MulticastConfigurations">
-			<xml-properties>
-				<xml-property name="description" value="multicast configuration of generic-vnf ip-address" />
-			</xml-properties>
-			<xml-root-element name="multicast-configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v14.MulticastConfiguration" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VplsPe">
+            <xml-root-element name="vpls-pe"/>
+            <java-attributes>
+                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for stag to get to VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v14.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v14.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPLS Provider Edge routers."/>
+                <xml-property name="indexedProps" value="prov-status,equipment-name"/>
+                <xml-property name="container" value="vpls-pes"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpls-pes/vpls-pe/{equipment-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="MulticastConfiguration">
-			<xml-root-element name="multicast-configuration" />
-			<java-attributes>
-				<xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of multicast configuration." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="protocol of multicast configuration" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="rp type of multicast configuration" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="multicast-configuration-id" />
-				<xml-property name="uniqueProps" value="multicast-configuration-id" />
-				<xml-property name="container" value="multicast-configurations" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="MulticastConfigurations">
+            <xml-properties>
+                <xml-property name="description" value="multicast configuration of generic-vnf ip-address"/>
+            </xml-properties>
+            <xml-root-element name="multicast-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v14.MulticastConfiguration"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Vces">
-			<xml-properties>
-				<xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated." />
-			</xml-properties>
-			<xml-root-element name="vces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v14.Vce" />
-			</java-attributes>
-		</java-type>
+        <java-type name="MulticastConfiguration">
+            <xml-root-element name="multicast-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of multicast configuration."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="protocol of multicast configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rp type of multicast configuration"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="multicast-configuration-id"/>
+                <xml-property name="uniqueProps" value="multicast-configuration-id"/>
+                <xml-property name="container" value="multicast-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Vce">
-			<xml-root-element name="vce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternate name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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 strictly map to ASDC services, 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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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="Network role being played by this VNF" />
-					</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, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of VPE connected to this VCE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Loopback0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  see child relationships" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v14.PortGroups" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v14.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v14.Entitlements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
-				<xml-property name="nameProps" value="vnf-name" />
-				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" />
-				<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-				<xml-property name="uniqueProps" value="vnf-id" />
-				<xml-property name="container" value="vces" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated."/>
+            </xml-properties>
+            <xml-root-element name="vces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v14.Vce"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="PortGroups">
-			<xml-root-element name="port-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v14.PortGroup" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Vce">
+            <xml-root-element name="vce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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 strictly map to ASDC services, 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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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="Network role being played by this VNF"/>
+                    </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, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of VPE connected to this VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Loopback0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  see child relationships"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v14.PortGroups"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v14.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v14.Entitlements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="vces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="uriTemplate" value="/network/vces/vce/{vnf-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="PortGroup">
-			<xml-root-element name="port-group" />
-			<java-attributes>
-				<xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of the interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network name of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="portGroupId" name="port-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for port group in vmware" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Likely to duplicate value of neutron network name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v14.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Used to capture the network interfaces of this VCE" />
-				<xml-property name="nameProps" value="port-group-name" />
-				<xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" />
-				<xml-property name="dependentOn" value="vce" />
-				<xml-property name="container" value="port-groups" />
-			</xml-properties>
-		</java-type>
+        <java-type name="PortGroups">
+            <xml-root-element name="port-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v14.PortGroup"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="CvlanTags">
-			<xml-root-element name="cvlan-tags" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v14.CvlanTagEntry" />
-			</java-attributes>
-		</java-type>
+        <java-type name="PortGroup">
+            <xml-root-element name="port-group"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network name of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="portGroupId" name="port-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for port group in vmware"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Likely to duplicate value of neutron network name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v14.CvlanTags"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
+                <xml-property name="nameProps" value="port-group-name"/>
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+                <xml-property name="dependentOn" value="vce"/>
+                <xml-property name="container" value="port-groups"/>
+                <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="CvlanTagEntry">
-			<xml-root-element name="cvlan-tag-entry" />
-			<java-attributes>
-				<xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="See mis-na-virtualization-platform.yang" />
-					</xml-properties>
-				</xml-element>
-				<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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="dependentOn" value="port-group" />
-				<xml-property name="indexedProps" value="cvlan-tag" />
-				<xml-property name="container" value="cvlan-tags" />
-			</xml-properties>
-		</java-type>
+        <java-type name="CvlanTags">
+            <xml-root-element name="cvlan-tags"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v14.CvlanTagEntry"/>
+            </java-attributes>
+        </java-type>
 
+        <java-type name="CvlanTagEntry">
+            <xml-root-element name="cvlan-tag-entry"/>
+            <java-attributes>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
+                    </xml-properties>
+                </xml-element>
+                <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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="dependentOn" value="port-group"/>
+                <xml-property name="indexedProps" value="cvlan-tag"/>
+                <xml-property name="container" value="cvlan-tags"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/>
+            </xml-properties>
+        </java-type>
 
 
-		<java-type name="Vnfcs">
-			<xml-properties>
-				<xml-property name="description" value="virtual network components associated with a vserver from application controller." />
-			</xml-properties>
-			<xml-root-element name="vnfcs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v14.Vnfc" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Vnfcs">
+            <xml-properties>
+                <xml-property name="description" value="virtual network components associated with a vserver from application controller."/>
+            </xml-properties>
+            <xml-root-element name="vnfcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v14.Vnfc"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Vnfc">
-			<xml-root-element name="vnfc" />
-			<java-attributes>
-				<xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of vnfc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Short code that is used in naming instances of the item being modeled" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="prov status of this vnfc" />
-					</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, mastered by APP-C" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Oam V4 vip address of this vnfc" />
-					</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)" />
-					</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="groupNotation" name="group-notation" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group notation of VNFC" />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local"/>
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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.v14.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id" />
-				<xml-property name="searchable" value="vnfc-name" />
-				<xml-property name="container" value="vnfcs" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Vnfc">
+            <xml-root-element name="vnfc"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vnfc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Short code that is used in naming instances of the item being modeled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="prov status of this vnfc"/>
+                    </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, mastered by APP-C"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Oam V4 vip address of this vnfc"/>
+                    </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 default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="groupNotation" name="group-notation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group notation of VNFC"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                    </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="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.v14.RelationshipList"/>
+                <xml-element java-attribute="cps" name="cps" type="inventory.aai.onap.org.v14.Cps"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id"/>
+                <xml-property name="searchable" value="vnfc-name"/>
+                <xml-property name="container" value="vnfcs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vnfcs/vnfc/{vnfc-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="L3Networks">
-			<xml-root-element name="l3-networks" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v14.L3Network" />
-			</java-attributes>
-		</java-type>
+        <java-type name="L3Networks">
+            <xml-root-element name="l3-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v14.L3Network"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="L3Network">
-			<xml-root-element name="l3-network" />
-			<java-attributes>
-				<xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the network, governed by some naming convention.." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the network - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role the network plans - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network technology - who defines these values?" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of this Interface" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="Set to true if bound to VPN" />
-					</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 from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="network role instance" />
-					</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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered 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="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contrail FQDN for the network" />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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="physicalNetworkName" name="physical-network-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name associated with the physical network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is a provider network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is a shared network." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="boolean indicatating whether or not network is an external network." />
-					</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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v14.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v14.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v14.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" >
-					<xml-properties>
-						<xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Generic network definition" />
-				<xml-property name="nameProps" value="network-name" />
-				<xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
-				<xml-property name="searchable" value="network-id,network-name" />
-				<xml-property name="uniqueProps" value="network-id" />
-				<xml-property name="container" value="l3-networks" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		<java-type name="NetworkPolicies">
-			<xml-root-element name="network-policies" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v14.NetworkPolicy" />
-			</java-attributes>
-		</java-type>
-		<java-type name="NetworkPolicy">
-			<xml-root-element name="network-policy" />
-			<java-attributes>
-				<xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID representing unique key to this instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contrail FQDN for the policy" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID for the openStack Heat instance" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="nameProps" value="network-policy-fqdn" />
-				<xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" />
-				<xml-property name="searchable" value="network-policy-id,network-policy-fqdn" />
-				<xml-property name="uniqueProps" value="network-policy-id" />
-				<xml-property name="container" value="network-policies" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
-		<java-type name="CtagAssignments">
-			<xml-root-element name="ctag-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v14.CtagAssignment" />
-			</java-attributes>
-		</java-type>
+        <java-type name="L3Network">
+            <xml-root-element name="l3-network"/>
+            <java-attributes>
+                <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network, governed by some naming convention.."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the network - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role the network plans - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network technology - who defines these values?"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isBoundToVpn" name="is-bound-to-vpn" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Set to true if bound to VPN"/>
+                    </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 from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="network role instance"/>
+                    </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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered 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="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the network"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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="physicalNetworkName" name="physical-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the physical network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is an external network."/>
+                    </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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isTrunked" name="is-trunked" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Trunked network indication."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v14.Subnets"/>
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v14.CtagAssignments"/>
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v14.SegmentationAssignments"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList">
+                    <xml-properties>
+                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic network definition"/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+                <xml-property name="searchable" value="network-id,network-name"/>
+                <xml-property name="uniqueProps" value="network-id"/>
+                <xml-property name="container" value="l3-networks"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/l3-networks/l3-network/{network-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="NetworkPolicies">
+            <xml-root-element name="network-policies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v14.NetworkPolicy"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="NetworkPolicy">
+            <xml-root-element name="network-policy"/>
+            <java-attributes>
+                <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID representing unique key to this instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the policy"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID for the openStack Heat instance"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="nameProps" value="network-policy-fqdn"/>
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="uniqueProps" value="network-policy-id"/>
+                <xml-property name="container" value="network-policies"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/network-policies/network-policy/{network-policy-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="CtagAssignments">
+            <xml-root-element name="ctag-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v14.CtagAssignment"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="CtagAssignment">
-			<xml-root-element name="ctag-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="id." />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="vlan-id-inner" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<xml-property name="container" value="ctag-assignments" />
-			</xml-properties>
-		</java-type>
+        <java-type name="CtagAssignment">
+            <xml-root-element name="ctag-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="id."/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vlan-id-inner"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="ctag-assignments"/>
+                <xml-property name="uriTemplate" value="/ctag-assignments/ctag-assignment/{vlan-id-inner}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Subnets">
-			<xml-root-element name="subnets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v14.Subnet" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Subnets">
+            <xml-root-element name="subnets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v14.Subnet"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Subnet">
-			<xml-root-element name="subnet" />
-			<java-attributes>
-				<xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Subnet ID, should be UUID." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name associated with the subnet." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of this subnet" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="gateway ip address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="network start address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="cidr mask" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip version" />
-					</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, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="dhcp enabled" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the start address reserved for use by dhcp" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the last address reserved for use by dhcp" />
-					</xml-properties>
-				</xml-element>
-					<xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role of the subnet, referenced when assigning IPs" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ip address assignment direction of the subnet" />
-					</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="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="sequence of the subnet" />
-					</xml-properties>
-				</xml-element>		
-				<xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v14.HostRoutes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />				
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="subnet-id,subnet-name" />
-				<xml-property name="nameProps" value="subnet-name" />
-				<xml-property name="uniqueProps" value="subnet-id" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<xml-property name="container" value="subnets" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Subnet">
+            <xml-root-element name="subnet"/>
+            <java-attributes>
+                <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Subnet ID, should be UUID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the subnet."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of this subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="gateway ip address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="network start address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="cidr mask"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version"/>
+                    </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, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="dhcpEnabled" name="dhcp-enabled" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="dhcp enabled"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the start address reserved for use by dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the last address reserved for use by dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the subnet, referenced when assigning IPs"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip address assignment direction of the subnet"/>
+                    </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="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="sequence of the subnet"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v14.HostRoutes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="subnet-id,subnet-name"/>
+                <xml-property name="nameProps" value="subnet-name"/>
+                <xml-property name="uniqueProps" value="subnet-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="subnets"/>
+                <xml-property name="uriTemplate" value="/subnets/subnet/{subnet-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="GenericVnfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of VNFs" />
-			</xml-properties>
-			<xml-root-element name="generic-vnfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v14.GenericVnf" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="GenericVnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VNFs"/>
+            </xml-properties>
+            <xml-root-element name="generic-vnfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v14.GenericVnf"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="GenericVnf">
-			<xml-root-element name="generic-vnf" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="GenericVnf">
+            <xml-root-element name="generic-vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="vnf instance id." />
                     </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-property name="suggestibleOnSearch" value="true"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" 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-property name="suggestibleOnSearch" value="true"/>
+                <xml-element java-attribute="vnfName" name="vnf-name" 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-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" 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-property name="suggestibleOnSearch" value="true"/>
+                    </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-property name="suggestibleOnSearch" value="true"/>
 					</xml-properties>
 				</xml-element>
                 <xml-element java-attribute="vnfPackageName" name="vnf-package-name" required="false" type="java.lang.String">
@@ -4395,70 +4503,70 @@
                     </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-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 java-attribute="nshd" name="nshd" type="java.lang.Long">
                     <xml-properties>
                         <xml-property name="description" value="number of associated SHD in vnf." />
@@ -4474,542 +4582,552 @@
                         <xml-property name="description" value="number of network in vnf." />
                     </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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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-property name="suggestibleOnSearch" value="true"/>
-					</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-property name="suggestibleOnSearch" value="true"/>
-					</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="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Gateway address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length for oam-address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Temporary location for S-TAG to get to VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network Management profile of this VNF" />
-					</xml-properties>
-				</xml-element>			
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v14.VfModules" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v14.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v14.Entitlements" />
-			</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,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="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-				<xml-property name="containsSuggestibleProps" value="true"/>
-				<xml-property name="suggestionAliases" value="VNFs"/>
-			</xml-properties>
-		</java-type>
+                <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). 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" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" 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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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-property name="suggestibleOnSearch" value="true"/>
+                    </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-property name="suggestibleOnSearch" value="true"/>
+                    </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="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gateway address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length for oam-address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for S-TAG to get to VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network Management profile of this VNF"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces"/>
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v14.VfModules"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v14.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v14.Entitlements"/>
+            </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,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,operational-status"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="generic-vnfs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="containsSuggestibleProps" value="true"/>
+                <xml-property name="suggestionAliases" value="VNFs"/>
+                <xml-property name="uriTemplate" value="/network/generic-vnfs/generic-vnf/{vnf-id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VfModules">
-			<xml-properties>
-				<xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
-			</xml-properties>
-			<xml-root-element name="vf-modules" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v14.VfModule" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VfModules">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs"/>
+            </xml-properties>
+            <xml-root-element name="vf-modules"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v14.VfModule"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VfModule">
-			<xml-root-element name="vf-module" />
-			<java-attributes>
-				<xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of vf-module." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of vf-module" />
-					</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." />
-					</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 vf-module, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" 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 base vf module" />
-					</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="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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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="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="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the Contrail unique ID for a service-instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" />
-					</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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</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,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>
-		</java-type>
+        <java-type name="VfModule">
+            <xml-root-element name="vf-module"/>
+            <java-attributes>
+                <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vf-module."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vf-module"/>
+                    </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."/>
+                    </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 vf-module, mastered by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isBaseVfModule" name="is-base-vf-module" 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 base vf module"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="automatedAssignment" name="automated-assignment" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Indicates whether vf-module assignment was done via automation or manually"/>
+                    </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="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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </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="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="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the Contrail unique ID for a service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit"/>
+                    </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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </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,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-property name="uriTemplate" value="/vf-modules/vf-module/{vf-module-id}"/>
+            </xml-properties>
+        </java-type>
 
 
-		<java-type name="LagLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of link aggregation connections" />
-			</xml-properties>
-			<xml-root-element name="lag-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v14.LagLink" />
-			</java-attributes>
-		</java-type>
+        <java-type name="LagLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregation connections"/>
+            </xml-properties>
+            <xml-root-element name="lag-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v14.LagLink"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="LagLink">
-			<xml-root-element name="lag-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="LAG links can connect lag-interfaces" />
-				<xml-property name="indexedProps" value="link-name" />
-				<xml-property name="container" value="lag-links" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="LagLink">
+            <xml-root-element name="lag-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="LAG links can connect lag-interfaces"/>
+                <xml-property name="indexedProps" value="link-name"/>
+                <xml-property name="container" value="lag-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/lag-links/lag-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Newvces">
-			<xml-properties>
-				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-			</xml-properties>
-			<xml-root-element name="newvces" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v14.Newvce" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Newvces">
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+            </xml-properties>
+            <xml-root-element name="newvces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v14.Newvce"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Newvce">
-			<xml-root-element name="newvce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Alternate name of VNF." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  do not use" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Client should send valid enumerated value." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
-				<xml-property name="nameProps" value="vnf-name" />
-				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" />
-				<xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" />
-				<xml-property name="uniqueProps" value="vnf-id2" />
-				<xml-property name="container" value="newvces" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Newvce">
+            <xml-root-element name="newvce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="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="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2"/>
+                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id2"/>
+                <xml-property name="container" value="newvces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/newvces/newvce/{vnf-id2}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Pnfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of Physical Network Functions." />
-			</xml-properties>
-			<xml-root-element name="pnfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v14.Pnf" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="Pnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Physical Network Functions."/>
+            </xml-properties>
+            <xml-root-element name="pnfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v14.Pnf"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Pnf">
-			<xml-root-element name="pnf" />
-			<java-attributes>
-				<xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="unique name of Physical Network Function." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="name of Physical Network Function." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="URL to endpoint where AAI can get more details." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="source of name2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="id of pnf" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." />
-					</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 java-attribute="frameId" name="frame-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Serial number of the device" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 Loopback 0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV4 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 AIM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="IPV6 OAM address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
-					</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="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
-					</xml-properties>
-				</xml-element>
+        <java-type name="Pnf">
+            <xml-root-element name="pnf"/>
+            <java-attributes>
+                <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique name of Physical Network Function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name of Physical Network Function."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="source of name2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of pnf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF."/>
+                    </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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number of the device"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                    </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="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="admin Status of this PNF" />
@@ -5025,294 +5143,298 @@
 						<xml-property name="description" value="Store the model-customization-id for this object." />
 					</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  model."/>
-						<xml-property name="visibility" value="deployment"/>
-						<xml-property name="requires" value="model-version-id"/>
-						<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  model."/>
-						<xml-property name="visibility" value="deployment"/>
-						<xml-property name="requires" value="model-invariant-id"/>
-						<xml-property name="dbAlias" value="model-version-id-local"/>
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v14.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." />
-				<xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,operational-status,admin-status" />
-				<xml-property name="searchable" value="pnf-name" />
-				<xml-property name="uniqueProps" value="pnf-name" />
-				<xml-property name="container" value="pnfs" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+                <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  model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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  model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v14.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
+                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,admin-status"/>
+                <xml-property name="searchable" value="pnf-name"/>
+                <xml-property name="uniqueProps" value="pnf-name"/>
+                <xml-property name="container" value="pnfs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/pnfs/pnf/{pnf-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="PhysicalLinks">
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
-			</xml-properties>
-			<xml-root-element name="physical-links" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v14.PhysicalLink" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
+        <java-type name="PhysicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+            </xml-properties>
+            <xml-root-element name="physical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v14.PhysicalLink"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="PhysicalLink">
-			<xml-root-element name="physical-link" />
-			<java-attributes>
-				<xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the numeric part of the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Captures the units corresponding to the speed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit it" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Dual access mode (e.g., primary, secondary" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the service Provider on this link." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Upstream Bandwidth value agreed with the service provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Units for the upstream BW value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
-					<xml-properties>
-						<xml-property name="description" value="Downstream Bandwidth value agreed with the service provider" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Units for downstream BW value" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
-				<xml-property name="indexedProps" value="circuit-id,link-name" />
-				<xml-property name="alternateKeys1" value="circuit-id" />
-				<xml-property name="container" value="physical-links" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="searchable" value="link-name,circuit-id" />
-			</xml-properties>
-		</java-type>
+        <java-type name="PhysicalLink">
+            <xml-root-element name="physical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit it"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the service Provider on this link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for the upstream BW value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for downstream BW value"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+                <xml-property name="indexedProps" value="circuit-id,link-name"/>
+                <xml-property name="alternateKeys1" value="circuit-id"/>
+                <xml-property name="container" value="physical-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="searchable" value="link-name,circuit-id"/>
+                <xml-property name="uriTemplate" value="/network/physical-links/physical-link/{link-name}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="VigServers">
-			<xml-root-element name="vig-servers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v14.VigServer" />
-			</java-attributes>
-		</java-type>
+        <java-type name="VigServers">
+            <xml-root-element name="vig-servers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v14.VigServer"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="VigServer">
-			<xml-root-element name="vig-server" />
-			<java-attributes>
-				<xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" >
-					<xml-properties>
-						<xml-property name="description" value="v4 IP of the vig server" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" >
-					<xml-properties>
-						<xml-property name="description" value="v6 IP of the vig server" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
-				<xml-property name="indexedProps" value="vig-address-type" />
-				<xml-property name="dependentOn" value="ipsec-configuration" />
-				<xml-property name="container" value="vig-servers" />
-			</xml-properties>
-		</java-type>
+        <java-type name="VigServer">
+            <xml-root-element name="vig-server"/>
+            <java-attributes>
+                <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4 IP of the vig server"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v6 IP of the vig server"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607"/>
+                <xml-property name="indexedProps" value="vig-address-type"/>
+                <xml-property name="dependentOn" value="ipsec-configuration"/>
+                <xml-property name="container" value="vig-servers"/>
+                <xml-property name="uriTemplate" value="/vig-servers/vig-server/{vig-address-type}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="IpsecConfigurations">
-			<xml-root-element name="ipsec-configurations" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v14.IpsecConfiguration" />
-			</java-attributes>
-		</java-type>
+        <java-type name="IpsecConfigurations">
+            <xml-root-element name="ipsec-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v14.IpsecConfiguration"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="IpsecConfiguration">
-			<xml-root-element name="ipsec-configuration" />
-			<java-attributes>
-				<xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of this configuration" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network address of shared DMZ" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="can be 1 or 2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" />
-					</xml-properties>
-				</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-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="pre-shared key for the above group name " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Lifetime for IKEv1 SA" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="md5, sha1, sha256, sha384" />
-					</xml-properties>
-				</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-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Life time for IPSec SA" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="enable PFS or not" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The time between DPD probe" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" />
-					</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.v14.RelationshipList" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v14.VigServers" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
-				<xml-property name="indexedProps" value="ipsec-configuration-id" />
-				<xml-property name="uniqueProps" value="ipsec-configuration-id" />
-				<xml-property name="container" value="ipsec-configurations" />
-				<xml-property name="namespace" value="network" />
+        <java-type name="IpsecConfiguration">
+            <xml-root-element name="ipsec-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of this configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network address of shared DMZ"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="can be 1 or 2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384"/>
+                    </xml-properties>
+                </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-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="pre-shared key for the above group name "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Lifetime for IKEv1 SA"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="md5, sha1, sha256, sha384"/>
+                    </xml-properties>
+                </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-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Life time for IPSec SA"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="enable PFS or not"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The time between DPD probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down"/>
+                    </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.v14.RelationshipList"/>
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v14.VigServers"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
+                <xml-property name="indexedProps" value="ipsec-configuration-id"/>
+                <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
+                <xml-property name="container" value="ipsec-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}"/>
 			</xml-properties>
 		</java-type>
 
@@ -5386,251 +5508,257 @@
 				<xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String" />
 				<xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String" />
 			</java-attributes>
-		</java-type>
+        </java-type>
 
-		<java-type name="Models">
-			<xml-properties>
-				<xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" />
-			</xml-properties>
-			<xml-root-element name="models" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v14.Model" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Models">
+            <xml-properties>
+                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models"/>
+            </xml-properties>
+            <xml-root-element name="models"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v14.Model"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Model">
-			<xml-root-element name="model" />
-			<xml-properties>
-				<xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version" />
-				<xml-property name="nameProps" value="model-type" />
-				<xml-property name="indexedProps" value="model-invariant-id,model-type" />
-				<xml-property name="uniqueProps" value="model-invariant-id" />
-				<xml-property name="container" value="models" />
-				<xml-property name="namespace" value="service-design-and-creation" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
-					</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="modelVers" name="model-vers" type="inventory.aai.onap.org.v14.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Model">
+            <xml-root-element name="model"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version"/>
+                <xml-property name="nameProps" value="model-type"/>
+                <xml-property name="indexedProps" value="model-invariant-id,model-type"/>
+                <xml-property name="uniqueProps" value="model-invariant-id"/>
+                <xml-property name="container" value="models"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/models/model/{model-invariant-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                    </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="modelVers" name="model-vers" type="inventory.aai.onap.org.v14.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
 
-		<java-type name="ModelVers">
-			<xml-root-element name="model-vers" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v14.ModelVer" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ModelVer">
-			<xml-root-element name="model-ver" />
-			<xml-properties>
-				<xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" />
-				<xml-property name="nameProps" value="model-name" />
-				<xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status" />
-				<xml-property name="uniqueProps" value="model-version-id" />
-				<xml-property name="container" value="model-vers" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the model, which can change from version to version." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Distribution Status" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description" />
-					</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="modelElements" name="model-elements" type="inventory.aai.onap.org.v14.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelVers">
+            <xml-root-element name="model-vers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v14.ModelVer"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelElements">
-			<xml-root-element name="model-elements" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v14.ModelElement" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelVer">
+            <xml-root-element name="model-ver"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models"/>
+                <xml-property name="nameProps" value="model-name"/>
+                <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status"/>
+                <xml-property name="uniqueProps" value="model-version-id"/>
+                <xml-property name="container" value="model-vers"/>
+                <xml-property name="uriTemplate" value="/model-vers/model-ver/{model-version-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Distribution Status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description"/>
+                    </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="modelElements" name="model-elements" type="inventory.aai.onap.org.v14.ModelElements"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelElement">
-			<xml-properties>
-				<xml-property name="description" value="Defines how other models combine to make up a higher-level model." />
-				<xml-property name="uniqueProps" value="model-element-uuid" />
-				<xml-property name="indexedProps" value="model-element-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="model-elements" />
-			</xml-properties>
-			<xml-root-element name="model-element" />
-			<java-attributes>
-				<xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="How many of this type of element are required/allowed" />
-					</xml-properties>
-				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" >
-				</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="modelElements" name="model-elements" type="inventory.aai.onap.org.v14.ModelElements">
-					<xml-properties>
-						<xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v14.ModelConstraints">
-					<xml-properties>
-						<xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelElements">
+            <xml-root-element name="model-elements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v14.ModelElement"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelConstraints">
-			<xml-root-element name="model-constraints" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v14.ModelConstraint" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelElement">
+            <xml-properties>
+                <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
+                <xml-property name="uniqueProps" value="model-element-uuid"/>
+                <xml-property name="indexedProps" value="model-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-elements"/>
+                <xml-property name="uriTemplate" value="/model-elements/model-element/{model-element-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="model-element"/>
+            <java-attributes>
+                <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many of this type of element are required/allowed"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String">
+                </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="modelElements" name="model-elements" type="inventory.aai.onap.org.v14.ModelElements">
+                    <xml-properties>
+                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v14.ModelConstraints">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ModelConstraint">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="model-constraint-uuid" />
-				<xml-property name="indexedProps" value="model-constraint-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="model-constraints" />
-			</xml-properties>
-			<xml-root-element name="model-constraint" />
-			<java-attributes>
-				<xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v14.ConstrainedElementSets" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelConstraints">
+            <xml-root-element name="model-constraints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v14.ModelConstraint"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ConstrainedElementSets">
-			<xml-root-element name="constrained-element-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v14.ConstrainedElementSet" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ModelConstraint">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="model-constraint-uuid"/>
+                <xml-property name="indexedProps" value="model-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-constraints"/>
+                <xml-property name="uriTemplate" value="/model-constraints/model-constraint/{model-constraint-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="model-constraint"/>
+            <java-attributes>
+                <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v14.ConstrainedElementSets"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ConstrainedElementSet">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="constrained-element-set-uuid" />
-				<xml-property name="indexedProps" value="constrained-element-set-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="constrained-element-sets" />
-			</xml-properties>
-			<xml-root-element name="constrained-element-set" />
-			<java-attributes>
-				<xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v14.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ConstrainedElementSets">
+            <xml-root-element name="constrained-element-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v14.ConstrainedElementSet"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ElementChoiceSets">
-			<xml-root-element name="element-choice-sets" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v14.ElementChoiceSet" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ConstrainedElementSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
+                <xml-property name="indexedProps" value="constrained-element-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="constrained-element-sets"/>
+                <xml-property name="uriTemplate" value="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="constrained-element-set"/>
+            <java-attributes>
+                <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v14.ElementChoiceSets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="ElementChoiceSet">
-			<xml-properties>
-				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
-				<xml-property name="uniqueProps" value="element-choice-set-uuid" />
-				<xml-property name="indexedProps" value="element-choice-set-uuid" />
-				<xml-property name="allowDirectRead" value="true" />
-				<xml-property name="allowDirectWrite" value="false" />
-				<xml-property name="container" value="element-choice-sets" />
-			</xml-properties>
-			<xml-root-element name="element-choice-set" />
-			<java-attributes>
-				<xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="autoGenerateUuid" value="true" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v14.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="ElementChoiceSets">
+            <xml-root-element name="element-choice-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v14.ElementChoiceSet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ElementChoiceSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
+                <xml-property name="indexedProps" value="element-choice-set-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="element-choice-sets"/>
+                <xml-property name="uriTemplate" value="/element-choice-sets/element-choice-set/{element-choice-set-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="element-choice-set"/>
+            <java-attributes>
+                <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v14.ModelElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
 		<java-type name="NamedQueries">
 			<xml-root-element name="named-queries" />
@@ -5785,56 +5913,56 @@
 			</java-attributes>
 		</java-type>
 
-		<java-type name="OverloadedModel">
-			<xml-root-element name="overloaded-model" />
-			<xml-properties>
-				<xml-property name="description" value="Allows for legacy POST of old-style and new-style models" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the model, which can change from version to version." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Invariant unique ID which does not change from version to version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Description" />
-					</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="modelVers" name="model-vers" type="inventory.aai.onap.org.v14.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-		</java-type>
+        <java-type name="OverloadedModel">
+            <xml-root-element name="overloaded-model"/>
+            <xml-properties>
+                <xml-property name="description" value="Allows for legacy POST of old-style and new-style models"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Invariant unique ID which does not change from version to version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description"/>
+                    </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="modelVers" name="model-vers" type="inventory.aai.onap.org.v14.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+        </java-type>
 
 		<java-type name="InstanceFilters">
 			<xml-properties>
@@ -5856,7 +5984,7 @@
 				<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" />
@@ -5866,7 +5994,7 @@
 				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v14.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" />
@@ -5940,243 +6068,240 @@
 				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
 			</java-attributes>
 		</java-type>
-		
-		<java-type name="RouteTableReferences">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack route table references" />
-			</xml-properties>
-			<xml-root-element name="route-table-references" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v14.RouteTableReference" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="RouteTableReference">
-			<xml-root-element name="route-table-reference" />
-			<java-attributes>
-				<xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="FQDN entry in the route table." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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="uniqueProps" value="route-table-reference-id" />
-				<xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" />
-				<xml-property name="container" value="route-table-references" />
-				<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-properties>
-			<xml-root-element name="instance-groups" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v14.InstanceGroup" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="InstanceGroup">
-			<xml-root-element name="instance-group" />
-			<java-attributes>
-			
-			<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				
-				<xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role of the instance group." />
-					</xml-properties>
-				</xml-element>
 
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ASDC model id for this resource or service model." />
-						<xml-property name="visibility" value="deployment" />
-						<xml-property name="requires" value="model-version-id" />
-						<xml-property name="dbAlias" value="model-invariant-id-local" />
-					</xml-properties>
-				</xml-element>
+        <java-type name="RouteTableReferences">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="route-table-references"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v14.RouteTableReference"/>
+            </java-attributes>
+        </java-type>
 
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ASDC model version uid for this resource model." />
-						<xml-property name="visibility" value="deployment" />
-						<xml-property name="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="instanceGroupType" name="instance-group-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Only valid value today is lower case ha for high availability" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				
-				<xml-element java-attribute="instanceGroupName" name="instance-group-name" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Instance-Group Name." />
-					</xml-properties>
-				</xml-element>
-				
-				<xml-element java-attribute="instanceGroupFunction" name="instance-group-function" required="false" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Instance-Group Function" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			
-			<xml-properties>
-				<xml-property name="description" value="General mechanism for grouping instances" />
-				<xml-property name="nameProps" value="description,instance-group-name" />
-				<xml-property name="uniqueProps" value="id" />
-				<xml-property name="searchable" value="id,description"/>
-				<xml-property name="indexedProps" value="id,description,type,sub-type,model-invariant-id,model-version-id" />
-				<xml-property name="container" value="instance-groups" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
-		</java-type>
+        <java-type name="RouteTableReference">
+            <xml-root-element name="route-table-reference"/>
+            <java-attributes>
+                <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="FQDN entry in the route table."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
 
-		<java-type name="SegmentationAssignments">
-			<xml-properties>
-				<xml-property name="description" value="Collection of openstack segmentation assignments" />
-			</xml-properties>
-			<xml-root-element name="segmentation-assignments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v14.SegmentationAssignment" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="SegmentationAssignment">
-			<xml-root-element name="segmentation-assignment" />
-			<java-attributes>
-				<xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Openstack segmentation assignment." />
-				<xml-property name="indexedProps" value="segmentation-id" />
-				<xml-property name="dependentOn" value="l3-network" />
-				<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-properties>
-			<xml-root-element name="allotted-resources" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v14.AllottedResource" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="AllottedResource">
-			<xml-root-element name="allotted-resource" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="description" name="description" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The descriptive information assigned to this allotted resource instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Link back to more information in the controller" />
-					</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="requires" value="model-version-id" />
-						<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="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</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-properties>
-						<xml-property name="description" value="Concurrency 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" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="type" name="type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Generic description of the type of allotted resource." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="role" name="role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="role in the network that this resource will be providing." />
-					</xml-properties>
-				</xml-element>
+            <xml-properties>
+                <xml-property name="description" value="Openstack route table reference."/>
+                <xml-property name="nameProps" value="route-table-reference-fqdn"/>
+                <xml-property name="uniqueProps" value="route-table-reference-id"/>
+                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+                <xml-property name="container" value="route-table-references"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/route-table-references/route-table-reference/{route-table-reference-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="InstanceGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="instance-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v14.InstanceGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InstanceGroup">
+            <xml-root-element name="instance-group"/>
+            <java-attributes>
+
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the instance group."/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model version uid for this resource model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="instanceGroupType" name="instance-group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Only valid value today is lower case ha for high availability"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupName" name="instance-group-name" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance-Group Name."/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupFunction" name="instance-group-function" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance-Group Function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+
+            <xml-properties>
+                <xml-property name="description" value="General mechanism for grouping instances"/>
+                <xml-property name="nameProps" value="description,instance-group-name"/>
+                <xml-property name="uniqueProps" value="id"/>
+                <xml-property name="searchable" value="id,description"/>
+                <xml-property name="indexedProps" value="id,description,type,sub-type,model-invariant-id,model-version-id"/>
+                <xml-property name="container" value="instance-groups"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
+            </xml-properties>
+        </java-type>
+
+
+        <java-type name="SegmentationAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack segmentation assignments"/>
+            </xml-properties>
+            <xml-root-element name="segmentation-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v14.SegmentationAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SegmentationAssignment">
+            <xml-root-element name="segmentation-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack segmentation assignment."/>
+                <xml-property name="indexedProps" value="segmentation-id"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="segmentation-assignments"/>
+                <xml-property name="uriTemplate" value="/segmentation-assignments/segmentation-assignment/{segmentation-id}"/>
+            </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-properties>
+            <xml-root-element name="allotted-resources"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v14.AllottedResource"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AllottedResource">
+            <xml-root-element name="allotted-resource"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Link back to more information in the controller"/>
+                    </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="requires" value="model-version-id"/>
+                        <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="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency 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"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Generic description of the type of allotted resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role in the network that this resource will be providing."/>
+                    </xml-properties>
+                </xml-element>
 				<xml-element java-attribute="allottedResourceName" name="allotted-resource-name" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Store the name of this allotted-resource." />
@@ -6217,845 +6342,1028 @@
 						<xml-property name="description" value="Store the vpn-name of this allotted-resource." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v14.TunnelXconnects" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			
-			<xml-properties>
-				<xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" />
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v14.TunnelXconnects"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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,allotted-resource-name" />
-				<xml-property name="uniqueProps" value="id" />
+                <xml-property name="uniqueProps" value="id"/>
 				<xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name" />
-				<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 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-properties>
-			<xml-root-element name="tunnel-xconnects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v14.TunnelXconnect" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="TunnelXconnect">
-			<xml-root-element name="tunnel-xconnect" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN uplink bandwidth for WAN1" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN downlink bandwidth for WAN1" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN uplink bandwidth for WAN2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="The WAN downlink bandwidth for WAN2" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.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="indexedProps" value="id" />
-				<xml-property name="dependentOn" value="allotted-resource" />
-				<xml-property name="container" value="tunnel-xconnects" />
-				<!--  <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-properties>
-			<xml-root-element name="entitlements" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v14.Entitlement" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="Entitlement">
-			<xml-root-element name="entitlement" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of an entitlement resource. " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</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" />
-				<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-properties>
-			<xml-root-element name="licenses" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v14.License" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="License">
-			<xml-root-element name="license" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of a license resource. " />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</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" />
-				<xml-property name="container" value="licenses" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="Vnf">
-			<xml-root-element name="vnf"/>
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Abstract vnf class" />
-				<xml-property name="indexedProps" value="vnf-id" />
-				<xml-property name="uniqueProps" value="vnf-id" />
-				<xml-property name="inheritors" value="vce,generic-vnf" />
-				<xml-property name="abstract" value="true" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="Zones">
-			<xml-properties>
-				<xml-property name="description" value="Collection of zones" />
-			</xml-properties>
-			<xml-root-element name="zones" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v14.Zone" />
-			</java-attributes>
-		</java-type>
+                <xml-property name="dependentOn" value="service-instance"/>
+                <xml-property name="container" value="allotted-resources"/>
+                <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/allotted-resources/allotted-resource/{id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Zone">
-			<xml-root-element name="zone" />
-			<java-attributes>
-				<xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Code assigned by AIC to the zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="English name associated with the zone" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Design of zone [Medium/Large…]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Context of zone [production/test]" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="status" name="status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Status of a zone." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Concurrency value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
-				<xml-property name="nameProps" value="zone-name" />
-				<xml-property name="indexedProps" value="zone-id,design-type,zone-context" />
-				<xml-property name="uniqueProps" value="zone-id" />
-				<xml-property name="container" value="zones" />
-				<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.v14.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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Route target information" />
-				<xml-property name="container" value="route-targets" />
-				<xml-property name="dependentOn" value="vpn-binding" />
-				<xml-property name="canBeLinked" value="true" />
-			</xml-properties>
-		</java-type>
-						
-		<java-type name="SriovPfs">
-			<xml-properties>
-				<xml-property name="description" value="Collection of SR-IOV Physical Functions." />
-			</xml-properties>
-			<xml-root-element name="sriov-pfs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v14.SriovPf" />
-			</java-attributes>
-		</java-type>
-		<java-type name="SriovPf">
-			<xml-root-element name="sriov-pf" />
-			<java-attributes>
-				<xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Identifier for the sriov-pf" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="SR-IOV Physical Function" />
-				<xml-property name="indexedProps" value="pf-pci-id" />
-				<xml-property name="dependentOn" value="p-interface" />
-				<xml-property name="container" value="sriov-pfs" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="HostRoutes">
-			<xml-root-element name="host-routes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v14.HostRoute" />
-			</java-attributes>
-		</java-type>
-		<java-type name="HostRoute">
-			<xml-root-element name="host-route" />
-			<java-attributes>
-				<xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="host-route id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="subnet prefix" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Could be ip-address, hostname, or service-instance" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop" />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="host-route-id" />
-				<xml-property name="dependentOn" value="subnet" />
-				<xml-property name="container" value="host-routes" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="VipIpv4AddressList">
-			<xml-root-element name="vip-ipv4-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 32 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv4 Address Range" />
-				<xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="VipIpv6AddressList">
-			<xml-root-element name="vip-ipv6-address-list" />
-			<java-attributes>
-				<xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="IP address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Prefix length, 128 for single address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Inner VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-					<xml-properties>
-						<xml-property name="description" value="Outer VLAN tag" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="description" value="Indicator of fixed or floating address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="IPv6 Address Range" />
-				<xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
-				<xml-property name="dependentOn" value="cloud-region" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="OperationalEnvironments">
-			<xml-properties>
-				<xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC." />
-			</xml-properties>
-			<xml-root-element name="operational-environments" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v14.OperationalEnvironment" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</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-properties>
+            <xml-root-element name="tunnel-xconnects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v14.TunnelXconnect"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="OperationalEnvironment">
-			<xml-root-element name="operational-environment" />
-			<java-attributes>
-				<xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="UUID of an operational environment" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational Environment name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational Environment Type." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Status" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Tenant Context." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="workloadContext" name="workload-context" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Workload Context." />
-					</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.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC." />
-				<xml-property name="indexedProps" value="operational-environment-id" />
-				<xml-property name="nameProps" value="operational-environment-name" />
-				<xml-property name="uniqueProps" value="operational-environment-id" />
-				<xml-property name="container" value="operational-environments" />
-				<xml-property name="namespace" value="cloud-infrastructure" />
-			</xml-properties>
-		</java-type>
-		
-		<java-type name="ForwardingPaths">
-			<xml-root-element name="forwarding-paths" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v14.ForwardingPath" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ForwardingPath">
-			<xml-root-element name="forwarding-path"/>
-			<xml-properties>
-				<xml-property name="namespace" value="network"/>
-				<xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name"/>
-				<xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
-			  <xml-property name="container" value="forwarding-paths" />
-			  <xml-property name="nameProps" value="forwarding-path-name" />
-			  <xml-property name="uniqueProps" value="forwarding-path-id" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of this FP"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Name of the FP"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
-				<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="selflink" name="selflink" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="the self link for this FP"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v14.Forwarders" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="Forwarders">
-			<xml-root-element name="forwarders" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v14.Forwarder" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="Forwarder">
-			<xml-root-element name="forwarder"/>
-			<xml-properties>
-				<xml-property name="indexedProps" value="sequence"/>
-				<xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
-				<xml-property name="container" value="forwarders" />
-				<xml-property name="dependentOn" value="forwarding-path" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of this segmentation"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ingress, intermediate, egress"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
-				<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>
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ForwarderEvcs">
-			<xml-root-element name="forwarder-evcs"/>
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v14.ForwarderEvc"/>
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="ForwarderEvc">
-			<xml-root-element name="forwarder-evc"/>
-			<java-attributes>
-				<xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Key for forwarder-evc object"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Internal VLAN." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="SVLAN value for ingress of egress forwarder." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CVLAN value for ingress of egress forwarder." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
-				<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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="forwarder object is an optional child object of the Configuration object." />
-				<xml-property name="dependentOn" value="configuration" />
-				<xml-property name="uniqueProps" value="forwarder-evc-id" />
-				<xml-property name="container" value="forwarder-evcs" />
-			</xml-properties>
-		</java-type>
+        <java-type name="TunnelXconnect">
+            <xml-root-element name="tunnel-xconnect"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
 
-		<java-type name="Evcs">
-			<xml-root-element name="evcs" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v14.Evc" />
-			</java-attributes>
-		</java-type>
+            <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="indexedProps" value="id"/>
+                <xml-property name="dependentOn" value="allotted-resource"/>
+                <xml-property name="container" value="tunnel-xconnects"/>
+                <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/tunnel-xconnects/tunnel-xconnect/{id}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Evc">
-			<xml-root-element name="evc" />
-			<java-attributes>
-				<xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Unique/key field for the evc object" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Point-to-Point, Multi-Point" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Commited Information Rate" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CIR units" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Diversity Group ID" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="formerly Performance Group" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="EVC Circuit ID of ESP EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Committed Information Rate (For ESP)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="CIR units (For ESP)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Identifies ESP" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Interconnect type on ingress side of EVC." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="tagode for collector side of EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="tagMode for network side of EVC" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
-				<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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="evc object is an optional child object of the Configuration object." />
-				<xml-property name="dependentOn" value="configuration" />
-				<xml-property name="uniqueProps" value="evc-id" />
-				<xml-property name="container" value="evcs" />
-			</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-properties>
+            <xml-root-element name="entitlements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v14.Entitlement"/>
+            </java-attributes>
+        </java-type>
 
-		<java-type name="Collections">
-			<xml-root-element name="collections" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="collection" name="collection" type="inventory.aai.onap.org.v14.Collection" />
-			</java-attributes>
-		</java-type>
+        <java-type name="Entitlement">
+            <xml-root-element name="entitlement"/>
+            <java-attributes>
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of an entitlement resource. "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </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"/>
+                <xml-property name="container" value="entitlements"/>
+                <xml-property name="uriTemplate" value="/entitlements/entitlement/{group-uuid}/{resource-uuid}"/>
+            </xml-properties>
+        </java-type>
 
-		<java-type name="Collection">
-			<xml-root-element name="collection"/>
-			<java-attributes>
-				<xml-element java-attribute="collectionId" name="collection-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Collection Object UUID"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="ASDC model id for this resource or service model" />
-						<xml-property name="visibility" value="deployment" />
-						<xml-property name="requires" value="model-version-id" />
-						<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="Model Version" />
-						<xml-property name="visibility" value="deployment" />
-						<xml-property name="requires" value="model-invariant-id" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectionName" name="collection-name" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="collection name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectionType" name="collection-type" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Collection type" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectionRole" name="collection-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Collection Role" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectionFunction" name="collection-function" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Collection function" />
-					</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" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="collectionCustomizationId" name="collection-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
-				<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>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="namespace" value="network" />
-				<xml-property name="description" value="represents the collection resource in the TOSCA model" />
-				<xml-property name="uniqueProps" value="collection-id" />
-				<xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id" />
-				<xml-property name="container" value="collections" />
-			</xml-properties>
-		</java-type>
 
-		<java-type name="SpPartner">
-			<xml-root-element name="sp-partner" />
-			<java-attributes>
-				<xml-element java-attribute="spPartnerId" name="sp-partner-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this sp-partner by id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="url" name="url" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Store the URL of this sp-partner." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="callsource" name="callsource" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Store the callsource of this sp-partner." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Instance of an sp-partner" />
-				<xml-property name="indexedProps" value="sp-partner-id,url,callsource" />
-				<xml-property name="nameProps" value="sp-partner-id" />
-				<xml-property name="searchable" value="sp-partner-id" />
-				<xml-property name="uniqueProps" value="sp-partner-id" />
-				<xml-property name="container" value="sp-partners" />
-				<xml-property name="namespace" value="business" />
-			</xml-properties>
-		</java-type>
-		<java-type name="SpPartners">
-			<xml-root-element name="sp-partners" />
-			<xml-properties>
-				<xml-property name="description" value="Collection of sp-partners" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="spPartner" name="sp-partner" type="inventory.aai.onap.org.v14.SpPartner" />
-			</java-attributes>
-		</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-properties>
+            <xml-root-element name="licenses"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v14.License"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="License">
+            <xml-root-element name="license"/>
+            <java-attributes>
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of a license resource. "/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </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"/>
+                <xml-property name="container" value="licenses"/>
+                <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vnf">
+            <xml-root-element name="vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Abstract vnf class"/>
+                <xml-property name="indexedProps" value="vnf-id"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="inheritors" value="vce,generic-vnf"/>
+                <xml-property name="abstract" value="true"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Zones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of zones"/>
+            </xml-properties>
+            <xml-root-element name="zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v14.Zone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Zone">
+            <xml-root-element name="zone"/>
+            <java-attributes>
+                <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Code assigned by AIC to the zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English name associated with the zone"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Design of zone [Medium/Large…]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Context of zone [production/test]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status of a zone."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB"/>
+                <xml-property name="nameProps" value="zone-name"/>
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context"/>
+                <xml-property name="uniqueProps" value="zone-id"/>
+                <xml-property name="container" value="zones"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
+            </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.v14.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" type="java.lang.String" xml-key="true">
+                    <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" type="java.lang.String" xml-key="true">
+                    <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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Route target information"/>
+                <xml-property name="container" value="route-targets"/>
+                <xml-property name="dependentOn" value="vpn-binding"/>
+                <xml-property name="canBeLinked" value="true"/>
+                <xml-property name="uriTemplate" value="/route-targets/route-target/{global-route-target}/{route-target-role}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SriovPfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Physical Functions."/>
+            </xml-properties>
+            <xml-root-element name="sriov-pfs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v14.SriovPf"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovPf">
+            <xml-root-element name="sriov-pf"/>
+            <java-attributes>
+                <xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier for the sriov-pf"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Physical Function"/>
+                <xml-property name="indexedProps" value="pf-pci-id"/>
+                <xml-property name="dependentOn" value="p-interface"/>
+                <xml-property name="container" value="sriov-pfs"/>
+                <xml-property name="uriTemplate" value="/sriov-pfs/sriov-pf/{pf-pci-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="HostRoutes">
+            <xml-root-element name="host-routes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v14.HostRoute"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="HostRoute">
+            <xml-root-element name="host-route"/>
+            <java-attributes>
+                <xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="host-route id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="subnet prefix"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="host-route-id"/>
+                <xml-property name="dependentOn" value="subnet"/>
+                <xml-property name="container" value="host-routes"/>
+                <xml-property name="uriTemplate" value="/host-routes/host-route/{host-route-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VipIpv4AddressList">
+            <xml-root-element name="vip-ipv4-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+            <xml-property name="uriTemplate" value="/vip-ipv4-address-list/{vip-ipv4-address}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VipIpv6AddressList">
+            <xml-root-element name="vip-ipv6-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+            <xml-property name="uriTemplate" value="/vip-ipv6-address-list/{vip-ipv6-address}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OperationalEnvironments">
+            <xml-properties>
+                <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
+            </xml-properties>
+            <xml-root-element name="operational-environments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v14.OperationalEnvironment"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OperationalEnvironment">
+            <xml-root-element name="operational-environment"/>
+            <java-attributes>
+                <xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an operational environment"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operational Environment name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operational Environment Type."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Tenant Context."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Workload Context."/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
+                <xml-property name="indexedProps" value="operational-environment-id"/>
+                <xml-property name="nameProps" value="operational-environment-name"/>
+                <xml-property name="uniqueProps" value="operational-environment-id"/>
+                <xml-property name="container" value="operational-environments"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ForwardingPaths">
+            <xml-root-element name="forwarding-paths"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v14.ForwardingPath"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwardingPath">
+            <xml-root-element name="forwarding-path"/>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name"/>
+                <xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
+                <xml-property name="container" value="forwarding-paths"/>
+                <xml-property name="nameProps" value="forwarding-path-name"/>
+                <xml-property name="uniqueProps" value="forwarding-path-id"/>
+                <xml-property name="uriTemplate" value="/network/forwarding-paths/forwarding-path/{forwarding-path-id}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <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="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the self link for this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v14.Forwarders"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Forwarders">
+            <xml-root-element name="forwarders"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v14.Forwarder"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Forwarder">
+            <xml-root-element name="forwarder"/>
+            <xml-properties>
+                <xml-property name="indexedProps" value="sequence"/>
+                <xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
+                <xml-property name="container" value="forwarders"/>
+                <xml-property name="dependentOn" value="forwarding-path"/>
+                <xml-property name="uriTemplate" value="/forwarders/forwarder/{sequence}"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this segmentation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ingress, intermediate, egress"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <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>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwarderEvcs">
+            <xml-root-element name="forwarder-evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v14.ForwarderEvc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwarderEvc">
+            <xml-root-element name="forwarder-evc"/>
+            <java-attributes>
+                <xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for forwarder-evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Internal VLAN."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="SVLAN value for ingress of egress forwarder."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value for ingress of egress forwarder."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanMappings" name="vlan-mappings" type="inventory.aai.onap.org.v14.VlanMappings"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="forwarder object is an optional child object of the Configuration object."/>
+                <xml-property name="dependentOn" value="configuration"/>
+                <xml-property name="uniqueProps" value="forwarder-evc-id"/>
+                <xml-property name="container" value="forwarder-evcs"/>
+                <xml-property name="uriTemplate" value="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VlanMappings">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vlan mappings."/>
+            </xml-properties>
+            <xml-root-element name="vlan-mappings"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanMapping" name="vlan-mapping" type="inventory.aai.onap.org.v14.VlanMapping"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VlanMapping">
+            <xml-root-element name="vlan-mapping"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanMappingId" name="vlan-mapping-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for vlan-mapping object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="uniCvlan" name="uni-cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value from the UNI/ingress side of the SAREA gateway access device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nniSvlan" name="nni-svlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="SVLAN value from the NNI/egress side of the SAREA gateway access device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nniCvlan" name="nni-cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value from the NNI/egress side of the SAREA gateway access device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ivLan" name="ivlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The internal VLAN ('IVLAN') value.  Specific to Arista devices."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vlan-mapping object is an optional child object of the forwarder-evc object.  A given forwarder-evc object may have multiple vlan-mapping objects."/>
+                <xml-property name="dependentOn" value="forwarder-evc"/>
+                <xml-property name="uniqueProps" value="vlan-mapping-id"/>
+                <xml-property name="container" value="vlan-mappings"/>
+                <xml-property name="uriTemplate" value="/vlan-mappings/vlan-mapping/{vlan-mapping-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Evcs">
+            <xml-root-element name="evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v14.Evc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Evc">
+            <xml-root-element name="evc"/>
+            <java-attributes>
+                <xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique/key field for the evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Point-to-Point, Multi-Point"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Commited Information Rate"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diversity Group ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="formerly Performance Group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="EVC Circuit ID of ESP EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Committed Information Rate (For ESP)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units (For ESP)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies ESP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Interconnect type on ingress side of EVC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagode for collector side of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagMode for network side of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="evc object is an optional child object of the Configuration object."/>
+                <xml-property name="dependentOn" value="configuration"/>
+                <xml-property name="uniqueProps" value="evc-id"/>
+                <xml-property name="container" value="evcs"/>
+                <xml-property name="uriTemplate" value="/evcs/evc/{evc-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Collections">
+            <xml-root-element name="collections"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="collection" name="collection" type="inventory.aai.onap.org.v14.Collection"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Collection">
+            <xml-root-element name="collection"/>
+            <java-attributes>
+                <xml-element java-attribute="collectionId" name="collection-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection Object UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model"/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <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="Model Version"/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionName" name="collection-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="collection name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionType" name="collection-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionRole" name="collection-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection Role"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionFunction" name="collection-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection function"/>
+                    </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"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionCustomizationId" name="collection-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
+                <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>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="description" value="represents the collection resource in the TOSCA model"/>
+                <xml-property name="uniqueProps" value="collection-id"/>
+                <xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id"/>
+                <xml-property name="container" value="collections"/>
+                <xml-property name="uriTemplate" value="/network/collections/collection/{collection-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Cps">
+            <xml-properties>
+                <xml-property name="description" value="Collection of connection points."/>
+            </xml-properties>
+            <xml-root-element name="cps"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cp" name="cp" type="inventory.aai.onap.org.v14.Cp"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Cp">
+            <xml-root-element name="cp"/>
+            <java-attributes>
+                <xml-element java-attribute="cpInstanceId" name="cp-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the connection point."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portId" name="port-id" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="port index to represent multiple CPs on VNFC connected to same network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" required="false" 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.v14.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v14.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="point of attachment from services or resources to a virtual link or network."/>
+                <xml-property name="uniqueProps" value="cp-instance-id"/>
+                <xml-property name="dependentOn" value="vnfc"/>
+                <xml-property name="container" value="cps"/>
+                <xml-property name="uriTemplate" value="/cps/cp/{cp-instance-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VlanTags">
+            <xml-root-element name="vlan-tags"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v14.VlanTag"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VlanTag">
+            <xml-root-element name="vlan-tag"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the vlan-tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="purpose (l3-network to be connected to)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="VLAN inner id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="VLAN outer id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="is VLAN private?"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="vlan-tags"/>
+                <xml-property name="uniqueProps" value="vlan-tag-id"/>
+                <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkTechnologies">
+            <xml-properties>
+                <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/>
+            </xml-properties>
+            <xml-root-element name="network-technologies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v14.NetworkTechnology"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkTechnology">
+            <xml-root-element name="network-technology"/>
+            <java-attributes>
+                <xml-element java-attribute="networkTechnologyId" name="network-technology-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier of the network-technology object (UUID)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkTechnologyName" name="network-technology-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The network-technology  that a cloud-region can support. Current valid values- CONTRAIL AIC_SR_IOV OVS STANDARD-SR-IOV"/>
+                    </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.v14.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="The network-technology object is used to capture the supported network technologies of a cloud-region."/>
+                <xml-property name="nameProps" value="network-technology-id,network-technology-name"/>
+                <xml-property name="uniqueProps" value="network-technology-id"/>
+                <xml-property name="container" value="network-technologies"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SpPartner">
+            <xml-root-element name="sp-partner" />
+            <java-attributes>
+                <xml-element java-attribute="spPartnerId" name="sp-partner-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this sp-partner by id" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="url" name="url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the URL of this sp-partner." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="callsource" name="callsource" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the callsource of this sp-partner." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of an sp-partner" />
+                <xml-property name="indexedProps" value="sp-partner-id,url,callsource" />
+                <xml-property name="nameProps" value="sp-partner-id" />
+                <xml-property name="searchable" value="sp-partner-id" />
+                <xml-property name="uniqueProps" value="sp-partner-id" />
+                <xml-property name="container" value="sp-partners" />
+                <xml-property name="namespace" value="business" />
+                <xml-property name="uriTemplate" value="/business/sp-partners/sp-partner/{sp-partner-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="SpPartners">
+            <xml-root-element name="sp-partners" />
+            <xml-properties>
+                <xml-property name="description" value="Collection of sp-partners" />
+            </xml-properties>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="spPartner" name="sp-partner" type="inventory.aai.onap.org.v14.SpPartner" />
+            </java-attributes>
+        </java-type>
 
 	</java-types>
 </xml-bindings>