Increase code coverage for aai-common repo to 30%
[aai/aai-common.git] / aai-schema / src / main / resources / oxm / aai_oxm_v11.xml
index 43114d4..5479cfa 100644 (file)
@@ -30,7 +30,7 @@
                                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v11.Search" />
                                <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v11.Actions" />
                                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v11.CloudInfrastructure" />
-                               <xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.onap.org.v11.LicenseManagement" />
+                               <xml-element java-attribute="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" />
                        </java-attributes>
                </java-type>
 
+               <java-type name="ExternalSystem">
+                       <xml-properties>
+                               <xml-property name="description" value="Namespace for external system." />
+                       </xml-properties>
+                       <xml-root-element name="external-system" />
+                       <java-attributes>
+                               <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v11.EsrEmsList" />
+                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v11.EsrVnfmList" />
+                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v11.EsrThirdpartySdncList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="EsrEmsList">
+                       <xml-root-element name="esr-ems-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v11.EsrEms" />
+                       </java-attributes>
+            <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrEms">
+                       <xml-root-element name="esr-ems" />
+                       <java-attributes>
+                               <xml-element java-attribute="emsId" name="ems-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of EMS." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist EMS address information used by EMS driver." />
+                               <xml-property name="indexedProps" value="ems-id" />
+                               <xml-property name="searchable" value="ems-id" />
+                               <xml-property name="container" value="esr-ems-list" />
+                               <xml-property name="namespace" value="external-system" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrVnfmList">
+                       <xml-root-element name="esr-vnfm-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v11.EsrVnfm" />
+                       </java-attributes>
+            <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrVnfm">
+                       <xml-root-element name="esr-vnfm" />
+                       <java-attributes>
+                               <xml-element java-attribute="vnfmId" name="vnfm-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of VNFM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vimId" name="vim-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="indecate the VIM to deploy VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="certificateUrl" name="certificate-url" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="certificate url of VNFM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist VNFM address information used by VF-C." />
+                               <xml-property name="indexedProps" value="vnfm-id" />
+                               <xml-property name="searchable" value="vnfm-id" />
+                               <xml-property name="container" value="esr-vnfm-list" />
+                               <xml-property name="namespace" value="external-system" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrThirdpartySdncList">
+                       <xml-root-element name="esr-thirdparty-sdnc-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v11.EsrThirdpartySdnc" />
+                       </java-attributes>
+            <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrThirdpartySdnc">
+                       <xml-root-element name="esr-thirdparty-sdnc" />
+                       <java-attributes>
+                               <xml-element java-attribute="thirdpartySdncId" name="thirdparty-sdnc-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of SDNC." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="location" name="location" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="used for DC type to indicate the location of SDNC, such as Core or Edge." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="productName" name="product-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="password used to access SDNC 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="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC." />
+                               <xml-property name="indexedProps" value="sdnc-id" />
+                               <xml-property name="searchable" value="sdnc-id" />
+                               <xml-property name="container" value="esr-thirdparty-sdnc-list" />
+                               <xml-property name="namespace" value="external-system" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrSystemInfoList">
+                       <xml-root-element name="esr-system-info-list" />
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of persistent block-level external system auth info." />
+                       </xml-properties>
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v11.EsrSystemInfo" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrSystemInfo">
+                       <xml-root-element name="esr-system-info" />
+                       <java-attributes>
+                               <xml-element java-attribute="esrSystemInfoId" name="esr-system-info-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of esr system info." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="systemName" name="system-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="name of external system." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="type" name="type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="type of external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vendor" name="vendor" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="vendor of external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="version" name="version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="version of external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceUrl" name="service-url" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="url used to access external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="userName" name="user-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="username used to access external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="password" name="password" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="password used to access external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="systemType" name="system-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="protocol" name="protocol" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="protocol of third party SDNC, for example netconf/snmp." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="sslCacert" name="ssl-cacert" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ca file content if enabled ssl on auth-url." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="sslInsecure" name="ssl-insecure" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Whether to verify VIM's certificate." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="service IP of ftp server." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="port" name="port" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="service port of ftp server." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudDomain" name="cloud-domain" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="domain info for authentication." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="defaultTenant" name="default-tenant" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="default tenant of VIM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="passive" name="passive" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ftp passive mode or not." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="remotepath" name="remote-path" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="resource or performance data file path." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="systemStatus" name="system-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the status of external system." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty 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="Persist common address information of external systems." />
+                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type" />
+                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type" />
+                               <xml-property name="container" value="esr-system-info-list" />
+                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc" />
+                       </xml-properties>
+               </java-type>
+
                <java-type name="CloudInfrastructure">
                        <xml-properties>
                                <xml-property name="description" value="Namespace for cloud infrastructure." />
                        <java-attributes>
                                <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" />
+                                               <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
                                                <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>          
                                <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="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" />
                        </java-attributes>
                        <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="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="description" value="Readable name of tenant" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
+                               <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-properties>
                                                <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Human friendly text regarding this interface." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                  
                                <xml-element java-attribute="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean">
                                        <xml-properties>
                                                <xml-property name="defaultValue" value="false"/>
                                                <xml-property name="description" value="boolean indicatating whether or not port is a mirrored." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                                  
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.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="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-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="dependentOn" value="vlan,l-interface,vnfc" />
                        </xml-properties>
                </java-type>
 
                                        <xml-properties>
                                                <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                                  
                                <xml-element java-attribute="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="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" />
                                <xml-property name="container" value="flavors" />
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="Snapshots">
                        <xml-properties>
                                <xml-property name="description" value="Collection of openstack snapshots" />
                        <xml-root-element name="snapshots" />
                        <java-attributes>
                                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v11.Snapshot" />
-                       </java-attributes>
+                       </java-attributes>              
                </java-type>
-
+               
                <java-type name="Snapshot">
                        <xml-root-element name="snapshot" />
                        <java-attributes>
                                <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" />
                                <xml-property name="dependentOn" value="cloud-region" />
                                <xml-property name="container" value="snapshots" />
-                       </xml-properties>
+                       </xml-properties>       
                </java-type>
-
+               
                <java-type name="GroupAssignments">
                        <xml-properties>
                                <xml-property name="description" value="Collection of openstack group assignments" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v11.GroupAssignment" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="GroupAssignment">
                        <xml-root-element name="group-assignment" />
                        <java-attributes>
                                        <xml-properties>
                                                <xml-property name="description" value="Group type - the type of group this instance refers to" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                          
                                <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Group name - name assigned to the group" />
                                        <xml-properties>
                                                <xml-property name="description" value="Group description - description of the group" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>          
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="dependentOn" value="cloud-region" />
                                <xml-property name="container" value="group-assignments" />
                        </xml-properties>
-               </java-type>
+               </java-type>                    
 
                <java-type name="Images">
                        <xml-properties>
                                                <xml-property name="description" value="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-property name="description" value="Human friendly text regarding this interface." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                        </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" />
+                               <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" />
+                               <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" />
                                <xml-property name="container" value="lag-interfaces" />
                        </xml-properties>
                </java-type>
                        </xml-properties>
                </java-type>
 
-               <java-type name="LicenseManagement">
-                       <xml-root-element name="license-management" />
-                       <java-attributes>
-                               <xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.onap.org.v11.LicenseKeyResources" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="LicenseKeyResources">
-                       <xml-root-element name="license-key-resources" />
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.onap.org.v11.LicenseKeyResource" />
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="LicenseKeyResource">
-                       <xml-root-element name="license-key-resource" />
-                       <java-attributes>
-                               <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" />
-                               <xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" />
-                               <xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" />
-                               <xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" />
-                               <xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" />
-                               <xml-element java-attribute="name" name="name" type="java.lang.String" />
-                               <xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" />
-                               <xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" />
-                               <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" />
-                               <xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" />
-                               <xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" type="java.lang.String" />
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="OBSOLETE OBJECT:  do not use" />
-                               <xml-property name="nameProps" value="name" />
-                               <xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" />
-                               <xml-property name="uniqueProps" value="att-uuid" />
-                               <xml-property name="container" value="license-key-resources" />
-                               <xml-property name="namespace" value="license-management" />
-                       </xml-properties>
-               </java-type>
-
                <java-type name="Business">
                        <xml-properties>
                                <xml-property name="description" value="Namespace for business related constructs" />
                                <xml-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="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v11.VipIpv4AddressList" />
+                               <xml-element java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v11.VipIpv6AddressList" />
                        </java-attributes>
                </java-type>
 
                                </xml-element>
                                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" />
+                                               <xml-property name="description" value="v4, v6, or ds for dual stack" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
                        </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,in-maint,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" />
+                               <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" />
                                <xml-property name="uniqueProps" value="link-id" />
                                <xml-property name="container" value="logical-links" />
                                <xml-property name="namespace" value="network" />
                        </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-properties>
                                        <xml-properties>
                                                <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                                  
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                                                <xml-property name="visibility" value="deployment" />
                                                <xml-property name="requires" value="model-invariant-id" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                          
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.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="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-properties>
                                                <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="role in the network that this model will be providing" />
+                                               <xml-property name="suggestibleOnSearch" value="true"/>
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="string assigned to this model used for naming purposes" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>  
                                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Path to the controller object." />
                                        <xml-properties>
                                                <xml-property name="description" value="Network Management profile of this VNF" />
                                        </xml-properties>
-                               </xml-element>
+                               </xml-element>                  
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
                                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
                                                <xml-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-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="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>
 
                                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v11.ModelVer" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="ModelVer">
                        <xml-root-element name="model-ver" />
                        <xml-properties>
                                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="SecondaryFilts">
                        <xml-properties>
                                <xml-property name="description" value="SecondaryFilts for performing a named-query or model query" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v11.SecondaryFilt" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="SecondaryFilt">
                        <xml-properties>
                                <xml-property name="description" value="SecondaryFilt for performing a named-query or model query" />
                                <xml-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-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v11.RouteTableReference" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="RouteTableReference">
                        <xml-root-element name="route-table-reference" />
                        <java-attributes>
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                        </java-attributes>
-
+                       
                        <xml-properties>
                                <xml-property name="description" value="Openstack route table reference." />
                                <xml-property name="nameProps" value="route-table-reference-fqdn" />
                                <xml-property name="namespace" value="network" />
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="InstanceGroups">
                        <xml-properties>
                                <xml-property name="description" value="Collection of openstack route table references" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v11.InstanceGroup" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="InstanceGroup">
                        <xml-root-element name="instance-group" />
                        <java-attributes>
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                        </java-attributes>
-
+                       
                        <xml-properties>
                                <xml-property name="description" value="General mechanism for grouping instances" />
                                <xml-property name="nameProps" value="description" />
                                <xml-property name="namespace" value="network" />
                        </xml-properties>
                </java-type>
-
+               
 
                <java-type name="SegmentationAssignments">
                        <xml-properties>
                                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v11.SegmentationAssignment" />
                        </java-attributes>
                </java-type>
-
+                               
                <java-type name="SegmentationAssignment">
                        <xml-root-element name="segmentation-assignment" />
                        <java-attributes>
                                <xml-property name="container" value="segmentation-assignments" />
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="AllottedResources">
                        <xml-properties>
                                <xml-property name="description" value="This object is used to store slices of services being offered" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v11.AllottedResource" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="AllottedResource">
                        <xml-root-element name="allotted-resource" />
                        <java-attributes>
                                <xml-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="container" value="allotted-resources" />
                                <!--  <xml-property name="namespace" value="network" /> -->
                        </xml-properties>
-               </java-type>
-
+               </java-type>    
+               
                <java-type name="TunnelXconnects">
                        <xml-properties>
                                <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v11.TunnelXconnect" />
                        </java-attributes>
                </java-type>
-
+               
                <java-type name="TunnelXconnect">
                        <xml-root-element name="tunnel-xconnect" />
                        <java-attributes>
                                </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                        </java-attributes>
-
+                       
                        <xml-properties>
                                <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted" />
                                <xml-property name="uniqueProps" value="id" />
                                <!--  <xml-property name="namespace" value="network" /> -->
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="Entitlements">
                        <xml-properties>
                                <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v11.Entitlement" />
                        </java-attributes>
                </java-type>
-
+                               
                <java-type name="Entitlement">
                        <xml-root-element name="entitlement" />
                        <java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Metadata for entitlement group." />
                                <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
-                               <xml-property name="dependentOn" value="generic-vnf,vce,vpe" />
+                               <xml-property name="dependentOn" value="generic-vnf,vce" />
                                <xml-property name="container" value="entitlements" />
                        </xml-properties>
                </java-type>
-
-
+               
+               
                <java-type name="Licenses">
                        <xml-properties>
                                <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management" />
                                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v11.License" />
                        </java-attributes>
                </java-type>
-
+                               
                <java-type name="License">
                        <xml-root-element name="license" />
                        <java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Metadata for license group." />
                                <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
-                               <xml-property name="dependentOn" value="generic-vnf,vce,vpe" />
+                               <xml-property name="dependentOn" value="generic-vnf,vce" />
                                <xml-property name="container" value="licenses" />
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="Vnf">
                        <xml-root-element name="vnf"/>
                        <java-attributes>
                                <xml-property name="abstract" value="true" />
                        </xml-properties>
                </java-type>
-
+               
                <java-type name="Zones">
                        <xml-properties>
                                <xml-property name="description" value="Collection of zones" />
                                <xml-property name="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-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.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-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-properties>
+               </java-type>
        </java-types>
 </xml-bindings>