From fc7f6093277e0d0b0ae00540d7f072ecd9c6f94d Mon Sep 17 00:00:00 2001
From: wreehil <wr148d@att.com>
Date: Mon, 16 Aug 2021 13:47:59 -0400
Subject: [PATCH] [AAI] Merging the latest v24 schema to ONAP

Issue-ID: AAI-3361
Change-Id: I67f37dec9bfcb53b317d85cc6620ef28e7af0fb1
Signed-off-by: wr148d <wr148d@att.com>
---
 .../onap/dbedgerules/v24/DbEdgeRules_v24.json      |  277 ++++-
 .../main/resources/onap/oxm/v24/aai_oxm_v24.xml    | 1204 +++++++++++++++++---
 2 files changed, 1305 insertions(+), 176 deletions(-)

diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json b/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json
index becf3a4..b275b01 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v24/DbEdgeRules_v24.json
@@ -937,6 +937,18 @@
 			"description": ""
 		},
 		{
+            "from": "service-instance",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
+        },
+        {
 			"from": "service-instance",
 			"to": "p-interface",
 			"label": "org.onap.relationships.inventory.ComposedOf",
@@ -5703,18 +5715,6 @@
 			"default": "true",
 			"description": ""
 		},
-		{
-			"from": "service-instance",
-			"to": "l3-network",
-			"label": "org.onap.relationships.inventory.ComposedOf",
-			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "NONE",
-			"delete-other-v": "NONE",
-			"prevent-delete": "NONE",
-			"default": "true",
-			"description": ""
-		},
 		{
 			"from": "service-instance",
 			"to": "owning-entity",
@@ -6352,39 +6352,260 @@
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":"Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object"
-		},{
+		},
+        {
+            "from": "metadatum",
+            "to": "rule",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
+        },{
+            "from": "class-map-member",
+            "to": "parameter-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description":"class-map-member to parameter-list"
+        },{
+            "from": "class-map-member",
+            "to": "class-map",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description":"Member of class map"
+        },{
+            "from": "policy-key-term",
+            "to": "parameter-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description":"policy-key-term to parameter-list"
+        },{
+            "from": "policy-map-member",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description":"Member of policy map"
+        },{
+            "from": "policy-map-member",
+            "to": "policy-key-term",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description":"Policy key term related to policy map member"
+        },{
+            "from": "policy-map-member",
+            "to": "class-map",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description":"Class-map related to policy-map-member"
+        },{
+            "from": "l-interface",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"Member of l-interface"
+        },{
+            "from": "hold-timer",
+            "to": "p-interface",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"used for generic interface parameters"
+        },{
+            "from": "gig-ether-option",
+            "to": "p-interface",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"used for generic interface parameters"
+        },{
+            "from": "temporary-parameter-list",
+            "to": "p-interface",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"used for generic interface parameters"
+        },{
+            "from": "temporary-parameter-list",
+            "to": "l-interface",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"used for generic interface parameters"
+        },{
+            "from": "aggregated-ether-option",
+            "to": "lag-interface",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"used for generic interface parameters"
+        },{
+            "from": "temporary-parameter-list",
+            "to": "lag-interface",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"used for generic interface parameters"
+        },{
+            "from": "lacp",
+            "to": "aggregated-ether-option",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"used for generic interface parameters"
+        },{
+            "from": "policy",
+            "to": "lag-interface",
+            "label": "tosca.relationships.network.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"used to support NCX-Hub"
+        },{
+            "from": "esi",
+            "to": "lag-interface",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"used for generic interface parameters"
+        },{
+            "from": "vlan-range",
+            "to": "zone",
+            "label": "tosca.relationships.network.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"The vlan-range is located in a zone."
+        },{
+            "from": "zone",
+            "to": "zone",
+            "label": "tosca.relationships.network.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"the zone is associated to another zone."
+        },{
+            "from": "lcmp-unreachable",
+            "to": "l-interface",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"used for generic interface"
+        },{
             "from": "k8s-resource",
             "to": "tenant",
             "label": "org.onap.relationships.inventory.BelongsTo",
             "direction": "OUT",
             "multiplicity": "MANY2ONE",
-			"contains-other-v": "!${direction}",
-			"delete-other-v": "NONE",
-			"prevent-delete": "!${direction}",
-			"default": "true",
-			"description":""
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description":""
         },{
             "from": "vf-module",
             "to": "k8s-resource",
             "label": "org.onap.relationships.inventory.Uses",
             "direction": "OUT",
             "multiplicity": "ONE2MANY",
-			"contains-other-v": "NONE",
-			"delete-other-v": "NONE",
-			"prevent-delete": "NONE",
-			"default": "true",
-			"description":""
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
         },{
             "from": "generic-vnf",
             "to": "k8s-resource",
             "label": "tosca.relationships.HostedOn",
             "direction": "OUT",
             "multiplicity": "ONE2MANY",
-			"contains-other-v": "NONE",
-			"delete-other-v": "NONE",
-			"prevent-delete": "NONE",
-			"default": "true",
-			"description":""
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
         }
 	]
 }
diff --git a/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml b/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml
index 723be8e..4d41c63 100644
--- a/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v24/aai_oxm_v24.xml
@@ -272,7 +272,7 @@
                     				<xml-properties>
                         				<xml-property name="description" value="Identifies the version of the upstream source."/>
                     				</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."/>
@@ -335,7 +335,7 @@
                     				<xml-properties>
                         				<xml-property name="description" value="Identifies the version of the upstream source."/>
                     				</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."/>
@@ -393,7 +393,7 @@
                     				<xml-properties>
                         				<xml-property name="description" value="Identifies the version of the upstream source."/>
                     				</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."/>
@@ -462,7 +462,7 @@
                     				<xml-properties>
                         				<xml-property name="description" value="Identifies the version of the upstream source."/>
                     				</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."/>
@@ -473,7 +473,7 @@
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
-                               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>                               
+                               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
                                <xml-property name="searchable" value="sdnc-id"/>
                                <xml-property name="container" value="esr-thirdparty-sdnc-list"/>
                                <xml-property name="namespace" value="external-system"/>
@@ -613,7 +613,7 @@
                     				<xml-properties>
                         				<xml-property name="description" value="Identifies the version of the upstream source."/>
                     				</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."/>
@@ -680,7 +680,7 @@
                 	<xml-properties>
                     	<xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -727,7 +727,7 @@
                 	<xml-properties>
                     	<xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -753,7 +753,7 @@
                 <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v24.CloudRegions"/>
                 <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v24.NetworkProfiles"/>
                 <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v24.Pservers"/>
-                <xml-element java-attribute="endpoints" name="endpoints" type="inventory.aai.onap.org.v24.Endpoints"/>        
+                <xml-element java-attribute="endpoints" name="endpoints" type="inventory.aai.onap.org.v24.Endpoints"/>
                 <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v24.VirtualDataCenters"/>
                 <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v24.OperationalEnvironments"/>
                 <xml-element java-attribute="geoRegions" name="geo-regions" type="inventory.aai.onap.org.v24.GeoRegions"/>
@@ -917,7 +917,7 @@
             </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="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type,data-owner,data-source,data-source-version,complex-name,identity-url"/>
                 <xml-property name="nameProps" value="owner-defined-type"/>
                 <xml-property name="container" value="cloud-regions"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
@@ -964,7 +964,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -973,7 +973,7 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="describes an hostAggregates"/>              
+                <xml-property name="description" value="describes an hostAggregates"/>
                 <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="host-aggregates"/>
@@ -1029,7 +1029,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -1041,7 +1041,7 @@
             <xml-properties>
                 <xml-property name="description" value="Definition of vlan range"/>
                 <xml-property name="indexedProps" value="vlan-range-id,vlan-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="dependentOn" value="cloud-region,zone"/>
                 <xml-property name="container" value="vlan-ranges"/>
                 <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/>
                 <xml-property name="searchable" value="vlan-range-id"/>
@@ -1112,7 +1112,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -1214,8 +1214,8 @@
                     </xml-properties>
                 </xml-element>
             </java-attributes>
-        </java-type>        
-        
+        </java-type>
+
         <java-type name="Complexes">
             <xml-properties>
                 <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
@@ -1282,7 +1282,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </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"/>
@@ -1362,7 +1362,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -1374,7 +1374,6 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of rack"/>
-                <xml-property name="uniqueProps" value="rack-name"/>
                 <xml-property name="indexedProps" value="rack-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="complex"/>
                 <xml-property name="container" value="racks"/>
@@ -1418,7 +1417,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -1662,7 +1661,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -1833,7 +1832,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -1978,6 +1977,36 @@
                         <xml-property name="description" value="Identifies l2-multicasting support on an l-interface. true indicates that l2-multicasting is supported; defaulted to false ."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="vlanIdStatementNeeded" name="vlan-id-statement-needed" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates whether the vlan-id-statement needs to be configured for the interface."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="encapsulation" name="encapsulation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="specifies the encapsulation type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="transportType" name="transport-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="specifies the transport type: e.g. L2transport"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="encapsulationTagRewrite" name="encapsulation-tag-rewrite" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="used to store the re-write command: e.g.rewrite ingress tag pop 1 symmetric"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mtu" name="mtu" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum transmission unit (MTU) is used to determine the maximum size of each packet in any TCP or IP transmission."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="loadInterval" name="load-interval" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Length of time for which data is used to compute load statistics."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
@@ -1997,6 +2026,8 @@
                 <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v24.Vlans"/>
                 <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v24.SriovVfs"/>
                 <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v24.LInterfaces"/>
+                <xml-element java-attribute="temporaryParameterLists" name="temporary-parameter-lists" type="inventory.aai.onap.org.v24.TemporaryParameterLists"/>
+                <xml-element java-attribute="lcmpUnreachables" name="lcmp-unreachables" type="inventory.aai.onap.org.v24.LcmpUnreachables"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v24.L3InterfaceIpv4AddressList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v24.L3InterfaceIpv6AddressList"/>
@@ -2014,7 +2045,7 @@
                 <xml-property name="container" value="l-interfaces"/>
                 <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/>
                 <xml-property name="searchable" value="interface-name"/>
-                <xml-property name="requiredProps" value="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered"/>
+                <xml-property name="requiredProps" value="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered,l2-multicasting"/>
              </xml-properties>
         </java-type>
 
@@ -2191,12 +2222,12 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.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,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp,lag-interface,p-interface"/>
                 <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/>
                 <xml-property name="requiredProps" value="l3-interface-ipv4-address"/>
@@ -2313,7 +2344,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of vlan"/>
-                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key,orchestration-status,prov-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key,orchestration-status,prov-status,vlan-id-outer,vlan-type,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="l-interface"/>
                 <xml-property name="container" value="vlans"/>
                 <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
@@ -2389,7 +2420,7 @@
             </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,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp,lag-interface,p-interface"/>
                 <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/>
                 <xml-property name="requiredProps" value="l3-interface-ipv6-address"/>
@@ -2535,7 +2566,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -2637,7 +2668,7 @@
                     <xml-properties>
                         <xml-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.v24.RelationshipList"/>
             </java-attributes>
             <xml-properties>
@@ -2853,7 +2884,7 @@
             <xml-properties>
                 <xml-property name="description" value="Key/value pairs"/>
                 <xml-property name="indexedProps" value="metaname,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="image,service-instance,connector,configuration,model-ver,profile"/>
+                <xml-property name="dependentOn" value="image,service-instance,connector,configuration,model-ver,profile,rule"/>
                 <xml-property name="container" value="metadata"/>
                 <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
                 <xml-property name="requiredProps" value="metaname,metaval"/>
@@ -2954,7 +2985,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -3154,7 +3185,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </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."/>
@@ -3171,7 +3202,7 @@
             <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,fqdn"/>
-                <xml-property name="indexedProps" value="hostname,pserver-id,pserver-name2,inv-status,fqdn,prov-status,ptnii-equip-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="hostname,pserver-id,pserver-name2,inv-status,fqdn,prov-status,ptnii-equip-name,equip-model,equip-vendor,function,data-owner,data-source,data-source-version,role"/>
                 <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address,operational-status"/>
                 <xml-property name="uniqueProps" value="hostname"/>
                 <xml-property name="container" value="pservers"/>
@@ -3209,7 +3240,7 @@
                 	<xml-properties>
                     	<xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -3359,6 +3390,31 @@
                         <xml-property name="description" value="connect interdomain link"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="encapsulation" name="encapsulation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="specifies the encapsulation type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="adminState" name="admin-state" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="At interface inventory, set to value reflecting the state at initial configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="loadInterval" name="load-interval" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Length of time for which data is used to compute load statistics."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="lldp" name="lldp" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Link Layer Discovery Protocol: link layer protocol used by network devices for advertising their identity, capabilities, and neighbors on a local area network based on IEEE 802 technology. Values: enable, disable, NULL"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dampening" name="dampening" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="specifies the dampening configuration to slow down the operation of automation scripts executed on the device. Values: NULL (dampening not configured) DEFAULT (dampening w/o options) configures as ‘dampening’ dampening options configures dampening w/ options"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
@@ -3374,17 +3430,20 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
                 <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v24.SriovPfs"/>
                 <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v24.LInterfaces"/>
                 <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v24.Activities"/>
+                <xml-element java-attribute="holdTimers" name="hold-timers" type="inventory.aai.onap.org.v24.HoldTimers"/>
+                <xml-element java-attribute="gigEtherOptions" name="gig-ether-options" type="inventory.aai.onap.org.v24.GigEtherOptions"/>
+                <xml-element java-attribute="temporaryParameterLists" name="temporary-parameter-lists" type="inventory.aai.onap.org.v24.TemporaryParameterLists"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v24.L3InterfaceIpv4AddressList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v24.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Physical interface (e.g., nic)"/>
-                <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-function,interface-role,interface-name2,data-owner,data-source,data-source-version"/>              
+                <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-function,interface-role,interface-name2,data-owner,data-source,data-source-version,interface-type,macaddr,inv-status"/>
                 <xml-property name="uiEditableProps" value="prov-status,port-description"/>
                 <xml-property name="nameProps" value="prov-status"/>
                 <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
@@ -3495,14 +3554,47 @@
                         <xml-property name="description" value="Used to identify the type of lag-interface."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="encapsulation" name="encapsulation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="specifies the encapsulation type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="flexibleVlanTagging" name="flexible-vlan-tagging" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Specifies support for simultaneous transmission of 802.1Q VLAN single-tag and dual-tag frames on logical interfaces on the same Ethernet port, and on pseudowire logical interfaces."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mtu" name="mtu" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum transmission unit (MTU) is used to determine the maximum size of each packet in any TCP or IP transmission."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="loadInterval" name="load-interval" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Length of time for which data is used to compute load statistics."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="loggingEvent" name="logging-event" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Enables system logging of interface state-change events Values: * NULL (not enabled/configured) Link-status future options, i.e. default, enable, trunk-status."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dampening" name="dampening" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="throttles interface flapping events to prevent excessive churn and processing of routing tables. Values: NULL (dampening not configured DEFAULT (dampening w/o options) configures as ‘dampening’ dampening options configures dampening w/ options"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
                 <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v24.LInterfaces"/>
+                <xml-element java-attribute="aggregatedEtherOptions" name="aggregated-ether-options" type="inventory.aai.onap.org.v24.AggregatedEtherOptions"/>
+                <xml-element java-attribute="temporaryParameterLists" name="temporary-parameter-lists" type="inventory.aai.onap.org.v24.TemporaryParameterLists"/>
+                <xml-element java-attribute="esis" name="esis" type="inventory.aai.onap.org.v24.Esis"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v24.L3InterfaceIpv4AddressList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v24.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Link aggregate interface"/>
-                <xml-property name="indexedProps" value="interface-name,interface-id,interface-role,interface-function,prov-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="interface-name,interface-id,interface-role,interface-function,prov-status,data-owner,data-source,data-source-version,interface-type"/>
                 <xml-property name="uiEditableProps" value="prov-status"/>
                 <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/>
                 <xml-property name="container" value="lag-interfaces"/>
@@ -3510,7 +3602,7 @@
                 <xml-property name="requiredProps" value="interface-name,in-maint"/>
              </xml-properties>
         </java-type>
-        
+
         <java-type name="Endpoints">
             <xml-properties>
                 <xml-property name="description" value="Collection of endpoints."/>
@@ -3578,7 +3670,7 @@
                 <xml-property name="requiredProps" value="endpoint-id"/>
 				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
 	         </xml-properties>
-        </java-type>        
+        </java-type>
 
         <java-type name="Activities">
             <xml-properties>
@@ -3668,7 +3760,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -3736,7 +3828,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>              
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
             </java-attributes>
             <xml-properties>
@@ -3788,7 +3880,7 @@
                 	<xml-properties>
                     	<xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -3804,7 +3896,8 @@
                 <xml-property name="searchable" value="bwa-id"/>
                 <xml-property name="uniqueProps" value="bwa-id"/>
                 <xml-property name="container" value="bandwidth-attributes"/>
-                <xml-property name="dependentOn" value="pnf,p-interface"/>
+                <!--<xml-property name="dependentOn" value="pnf,p-interface"/>-->
+                <xml-property name="dependentOn" value="p-interface"/>
                 <xml-property name="requiredProps" value="bwa-id"/>
                 <xml-property name="uriTemplate" value="/bandwidth-attributes/bandwidth-attribute/{bwa-id}"/>
             </xml-properties>
@@ -3857,7 +3950,7 @@
                 	<xml-properties>
                     	<xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -3923,7 +4016,7 @@
                 	<xml-properties>
                     	<xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -4069,7 +4162,22 @@
                     <xml-properties>
                         <xml-property name="description" value="stores maximum number of paths for IPv6."/>
                     </xml-properties>
-                </xml-element>                                                   
+                </xml-element>
+                <xml-element java-attribute="v4MaxPathType" name="v4-max-path-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of v4-max-path"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6MaxPathType" name="v6-max-path-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of v6-max-path"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationStatus" name="configuration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Configuration status of the vrf"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="bgpGroups" name="bgp-groups" type="inventory.aai.onap.org.v24.BgpGroups"/>
                 <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v24.BgpNeighbors"/>
                 <xml-element java-attribute="aggregateRoutes" name="aggregate-routes" type="inventory.aai.onap.org.v24.AggregateRoutes"/>
@@ -4206,7 +4314,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -4408,7 +4516,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -4718,7 +4826,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -4984,7 +5092,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
                 <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v24.Metadata"/>
                 <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v24.AllottedResources"/>
@@ -5202,7 +5310,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -5547,7 +5655,7 @@
                 </xml-element>
                 <xml-element java-attribute="linkDescription" name="link-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="A description for the logical-link."/>
+                        <xml-property name="description" value="Descriptor to identify the path of the link. In the format of ptn-ii-a_interface-a|ptn-ii-b_interface-b"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="segmentId" name="segment-id" type="java.lang.String">
@@ -5580,7 +5688,8 @@
             </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,link-function,link-type,purpose,operational-status,data-owner,data-source,data-source-version"/>
+                <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,link-function,link-type,purpose,operational-status,link-role,link-description,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="link-description"/>
                 <xml-property name="uniqueProps" value="link-id"/>
                 <xml-property name="container" value="logical-links"/>
                 <xml-property name="namespace" value="network"/>
@@ -5623,7 +5732,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -6031,7 +6140,7 @@
                     <xml-properties>
                         <xml-property name="description" value="stores maximum number of paths for IPv6."/>
                     </xml-properties>
-                </xml-element>                  
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
@@ -6047,7 +6156,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v24.RouteTargets"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList">
                     <xml-properties>
@@ -6129,7 +6238,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="VPLS Provider Edge routers."/>
-                <xml-property name="indexedProps" value="prov-status,equipment-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="prov-status,equipment-name,vlan-id-outer,data-owner,data-source,data-source-version"/>
                 <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}"/>
@@ -6189,7 +6298,7 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-	            <xml-property name="description" value="Groups different VLANs that are on different logical interfaces on the same VNF. Multicast is the delivery of information to a group of destinations simultaneously, using the most efficient strategy to deliver messages over each link of the network only once, and create copies only when the links to the destinations split."/>	
+	            <xml-property name="description" value="Groups different VLANs that are on different logical interfaces on the same VNF. Multicast is the delivery of information to a group of destinations simultaneously, using the most efficient strategy to deliver messages over each link of the network only once, and create copies only when the links to the destinations split."/>
                 <xml-property name="indexedProps" value="multicast-configuration-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="multicast-configuration-id"/>
                 <xml-property name="container" value="multicast-configurations"/>
@@ -6428,7 +6537,7 @@
             <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,switch-name,interface-role,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status,data-owner,data-source,data-source-version,neutron-network-id"/>
                 <xml-property name="dependentOn" value="vce"/>
                 <xml-property name="container" value="port-groups"/>
                 <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -6466,7 +6575,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -6788,7 +6897,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v24.Subnets"/>
                 <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v24.CtagAssignments"/>
                 <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v24.SegmentationAssignments"/>
@@ -6802,7 +6911,7 @@
             <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,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,network-function,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,network-function,orchestration-status,data-owner,data-source,data-source-version,neutron-network-id"/>
                 <xml-property name="searchable" value="network-id,network-name"/>
                 <xml-property name="uniqueProps" value="network-id"/>
                 <xml-property name="container" value="l3-networks"/>
@@ -6850,7 +6959,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -6889,9 +6998,9 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-            	<xml-property name="description" value="Captures set of conditions, constraints, and settings that allow designation of who is authorized to connect to the network and the circumstances under which they can or cannot connect. Provides Contrail FQDN for policy."/>         	
+            	<xml-property name="description" value="Captures set of conditions, constraints, and settings that allow designation of who is authorized to connect to the network and the circumstances under which they can or cannot connect. Provides Contrail FQDN for policy."/>
                 <xml-property name="nameProps" value="network-policy-fqdn"/>
-                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn,data-owner,data-source,data-source-version,heat-stack-id"/>
                 <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"/>
@@ -7076,20 +7185,20 @@
                     <xml-properties>
                         <xml-property name="description" value="Configuration status of the subnet."/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v24.HostRoutes"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v24.IpAddressList"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
                 <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v24.BgpNeighbors"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="subnet-id,subnet-name,subnet-type,subnet-function,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="subnet-id,subnet-name,subnet-type,subnet-function,orchestration-status,data-owner,data-source,data-source-version,neutron-subnet-id"/>
                 <xml-property name="nameProps" value="subnet-name"/>
                 <xml-property name="uniqueProps" value="subnet-id"/>
                 <xml-property name="dependentOn" value="l3-network,zone"/>
                 <xml-property name="container" value="subnets"/>
                 <xml-property name="uriTemplate" value="/subnets/subnet/{subnet-id}"/>
-                <xml-property name="requiredProps" value="subnet-id"/>
+                <xml-property name="requiredProps" value="subnet-id,dhcp-enabled"/>
              </xml-properties>
         </java-type>
 
@@ -7448,7 +7557,7 @@
             <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,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,nm-profile-name,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,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,nm-profile-name,orchestration-status,vlan-id-outer,data-owner,data-source,data-source-version"/>
                 <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"/>
@@ -7580,7 +7689,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
                 <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
@@ -7909,7 +8018,7 @@
                     	<xml-property name="defaultValue" value="false"/>
                         <xml-property name="description" value="Flag for identifying spare equipment"/>
                     </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."/>
@@ -8017,7 +8126,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
 					</xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="softwareVersions" name="software-versions" type="inventory.aai.onap.org.v24.SoftwareVersions"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
                 <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v24.PInterfaces"/>
@@ -8030,13 +8139,13 @@
             </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,nf-type,admin-status,nf-role,prov-status,nf-naming-code,equipment-clli,phone-number,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,nf-type,admin-status,nf-role,prov-status,nf-naming-code,equipment-clli,phone-number,equip-model,equip-vendor,nf-function,data-owner,data-source,data-source-version"/>
                 <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-property name="requiredProps" value="pnf-name,in-maint"/>
+                <xml-property name="requiredProps" value="pnf-name,in-maint,spare-equipment-indicator"/>
              </xml-properties>
         </java-type>
 
@@ -8243,7 +8352,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of port"/>
-                <xml-property name="indexedProps" value="port-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="port-name,data-owner,data-source,data-source-version,part-number,equip-identifier"/>
                 <xml-property name="dependentOn" value="chassis,pluggable,card"/>
                 <xml-property name="container" value="ports"/>
                 <xml-property name="uriTemplate" value="/ports/port/{port-name}"/>
@@ -8501,7 +8610,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Software Version"/>
@@ -8604,6 +8713,11 @@
                         <xml-property name="description" value="Subtype used to categorize this physical link"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="linkDescription" name="link-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Descriptor to identify the path of the link. In the format of ptn-ii-a_interface-a|ptn-ii-b_interface-b"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
@@ -8619,7 +8733,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </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."/>
@@ -8630,7 +8744,8 @@
             </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,link-function,link-role,link-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="circuit-id,link-name,link-function,link-role,link-type,link-description,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="link-description"/>
                 <xml-property name="alternateKeys1" value="circuit-id"/>
                 <xml-property name="container" value="physical-links"/>
                 <xml-property name="namespace" value="network"/>
@@ -8973,7 +9088,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -9055,7 +9170,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -9233,7 +9348,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </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"/>
@@ -9460,6 +9575,7 @@
             <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="indexedProps" value="model-name"/>
             <xml-property name="requiredProps" value="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version"/>
             </xml-properties>
             <java-attributes>
@@ -9651,7 +9767,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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="Concurrency value"/>
@@ -9819,7 +9935,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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="Concurrency value"/>
@@ -9838,7 +9954,7 @@
         </java-type>
         <java-type name="ComposedResources">
             <xml-properties>
-                <xml-property name="description" value="This object is used to represent parent-child relationship between service-instance"/>
+                <xml-property name="description" value="This object is used to store slices of services being offered"/>
             </xml-properties>
             <xml-root-element name="composed-resources"/>
             <java-attributes>
@@ -9944,7 +10060,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>				
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
             </java-attributes>
 
@@ -10084,7 +10200,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>				
+                </xml-element>
                 <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v24.TunnelXconnects"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
             </java-attributes>
@@ -10354,7 +10470,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of bgp-neighbor"/>
-                <xml-property name="indexedProps" value="bgp-neighbor-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="bgp-neighbor-id,data-owner,data-source,data-source-version,prov-status"/>
                 <xml-property name="dependentOn" value="pnf,vrf,subnet,generic-vnf"/>
                 <xml-property name="nameProps" value="bgp-neighbor-id"/>
                 <xml-property name="container" value="bgp-neighbors"/>
@@ -10430,7 +10546,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -10649,6 +10765,11 @@
                         <xml-property name="description" value="Function of a zone."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="zoneNumber" name="zone-number" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Zone number identifier for multi-zone locations."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
@@ -10677,12 +10798,13 @@
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
-                <xml-element java-attribute="subnets" name="subnet" type="inventory.aai.onap.org.v24.Subnets"/>
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v24.Subnets"/>
+                <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v24.VlanRanges"/>
             </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,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context,data-owner,data-source,data-source-version,zone-number"/>
                 <xml-property name="uniqueProps" value="zone-id"/>
                 <xml-property name="container" value="zones"/>
                 <xml-property name="namespace" value="network"/>
@@ -10842,7 +10964,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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="Concurrency value"/>
@@ -10956,7 +11078,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="General mechanism for mapping between instances; cg-nat."/>
-                <xml-property name="indexedProps" value="mapping-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="mapping-id,data-owner,data-source,data-source-version,prov-status"/>
                 <xml-property name="uniqueProps" value="mapping-id"/>
                 <xml-property name="container" value="mappings"/>
                 <xml-property name="namespace" value="network"/>
@@ -11192,7 +11314,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Configuration status of the network route."/>
                     </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."/>
@@ -11209,7 +11331,7 @@
             	<xml-property name="container" value="network-routes"/>
             </xml-properties>
         </java-type>
-		
+
 		<java-type name="NextHops">
             <xml-root-element name="next-hops"/>
             <java-attributes>
@@ -11287,7 +11409,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Is among the series of routers that are connected together in a network and is the next possible destination for a data packet."/>
-                <xml-property name="indexedProps" value="next-hop-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="next-hop-id,ip-address,sequence,data-owner,data-source,data-source-version"/>
                 <xml-property name="namespace" value="network"/>
 				<xml-property name="container" value="next-hops"/>
                 <xml-property name="uriTemplate" value="/network/next-hops/next-hop/{next-hop-id}"/>
@@ -11295,7 +11417,7 @@
                 <xml-property name="requiredProps" value="next-hop-id,next-hop-type"/>
             </xml-properties>
         </java-type>
-		
+
 		<java-type name="Bfds">
             <xml-root-element name="bfds"/>
             <java-attributes>
@@ -11358,7 +11480,7 @@
                     <xml-properties>
                         <xml-property name="description" value="bfd multihop parameter"/>
                     </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."/>
@@ -11447,7 +11569,7 @@
                 <xml-property name="uriTemplate" value="/network/fqdns/fqdn/{fqdn}"/>
             </xml-properties>
         </java-type>
-		
+
         <java-type name="RouteTargets">
             <xml-properties>
                 <xml-property name="description" value="Collection of route target information"/>
@@ -11613,7 +11735,7 @@
             </java-attributes>
             <xml-properties>
 	            <xml-property name="description" value="Route packets to a specific host. Host routes are automatically added to the routing table for all IPv4 and IPv6 addresses that are configured on the router. The purpose of a host route is to create a corresponding CEF entry as a receive entry so that the packets destined to this IP address can be processed by the router itself."/>
-                <xml-property name="indexedProps" value="host-route-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="host-route-id,next-hop,data-owner,data-source,data-source-version"/>
                 <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}"/>
@@ -11688,7 +11810,7 @@
             </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,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
             <xml-property name="uriTemplate" value="/vip-ipv4-address-list/{vip-ipv4-address}"/>
             <xml-property name="requiredProps" value="vip-ipv4-address"/>
@@ -11763,7 +11885,7 @@
             </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,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
             <xml-property name="uriTemplate" value="/vip-ipv6-address-list/{vip-ipv6-address}"/>
             <xml-property name="requiredProps" value="vip-ipv6-address"/>
@@ -11841,7 +11963,7 @@
             </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,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="operational-environment-id,data-owner,data-source,data-source-version,tenant-context,workload-context"/>
                 <xml-property name="nameProps" value="operational-environment-name"/>
                 <xml-property name="uniqueProps" value="operational-environment-id"/>
                 <xml-property name="container" value="operational-environments"/>
@@ -12088,7 +12210,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
             </java-attributes>
@@ -12137,7 +12259,7 @@
                 	<xml-properties>
                 		<xml-property name="description" value="Size of the Customer Requested MTU (Maximum Transmission Unit)."/>
                 	</xml-properties>
-                </xml-element>         
+                </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"/>
@@ -12468,7 +12590,7 @@
                 <xml-property name="dependentOn" value="vlan-range"/>
                 <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/>
                 <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/>
-				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version,vlan-id-outer"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version,vlan-id-outer,vlan-id-inner"/>
             </xml-properties>
         </java-type>
 
@@ -12525,7 +12647,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
-                </xml-element>                
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
             </java-attributes>
@@ -12634,7 +12756,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -12822,7 +12944,7 @@
 						<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."/>
@@ -12921,7 +13043,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -13025,7 +13147,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -13104,7 +13226,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -13217,7 +13339,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -13336,7 +13458,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -13471,7 +13593,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -13632,7 +13754,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -13696,7 +13818,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -13803,7 +13925,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -13888,7 +14010,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -13903,7 +14025,7 @@
                 <xml-property name="uniqueProps" value="id"/>
                 <xml-property name="container" value="interlayer-attachments"/>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="requiredProps" value="id"/>
+                <xml-property name="requiredProps" value="id,inter-layer-lockId"/>
                 <xml-property name="uriTemplate" value="/network/interlayer-attachments/interlayer-attachment/{id}"/>
 
             </xml-properties>
@@ -14004,7 +14126,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -14128,7 +14250,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -14252,7 +14374,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -14282,10 +14404,15 @@
             	<xml-element java-attribute="hardwareCatalogItems" name="hardware-catalog-items" type="inventory.aai.onap.org.v24.HardwareCatalogItems"/>
             	<xml-element java-attribute="contacts" name="contacts" type="inventory.aai.onap.org.v24.Contacts"/>
                 <xml-element java-attribute="profiles" name="profiles" type="inventory.aai.onap.org.v24.Profiles"/>
-				<xml-element java-attribute="objectGroups" name="object-groups" type="inventory.aai.onap.org.v24.ObjectGroups"/>              
+				<xml-element java-attribute="objectGroups" name="object-groups" type="inventory.aai.onap.org.v24.ObjectGroups"/>
 				<xml-element java-attribute="policies" name="policies" type="inventory.aai.onap.org.v24.Policies"/>
 				<xml-element java-attribute="vlanCharacteristics" name="vlan-characteristics" type="inventory.aai.onap.org.v24.VlanCharacteristics"/>
 				<xml-element java-attribute="relationshipRules" name="relationship-rules" type="inventory.aai.onap.org.v24.RelationshipRules"/>
+                <xml-element java-attribute="parameterLists" name="parameter-lists" type="inventory.aai.onap.org.v24.ParameterLists"/>
+                <xml-element java-attribute="classMapMembers" name="class-map-members" type="inventory.aai.onap.org.v24.ClassMapMembers"/>
+                <xml-element java-attribute="classMaps" name="class-maps" type="inventory.aai.onap.org.v24.ClassMaps"/>
+                <xml-element java-attribute="policyKeyTerms" name="policy-key-terms" type="inventory.aai.onap.org.v24.PolicyKeyTerms"/>
+                <xml-element java-attribute="policyMapMembers" name="policy-map-members" type="inventory.aai.onap.org.v24.PolicyMapMembers"/>
             </java-attributes>
 		</java-type>
 
@@ -14362,7 +14489,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes an hardware-catalog-items"/>
-                <xml-property name="indexedProps" value="item-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="item-name,data-owner,data-source,data-source-version,part-number"/>
                 <xml-property name="uniqueProps" value="item-name"/>
                 <xml-property name="container" value="hardware-catalog-items"/>
                 <xml-property name="namespace" value="common"/>
@@ -14389,7 +14516,7 @@
                         <xml-property name="description" value="Name of the profile"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="profileType" name="profile-type" type="java.lang.String">
+                <xml-element java-attribute="profileType" name="profile-type" required="true" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Type of profile (ex,network-power-profile)"/>
                     </xml-properties>
@@ -14434,7 +14561,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -14451,7 +14578,7 @@
                 <xml-property name="container" value="profiles"/>
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="uriTemplate" value="/common/profiles/profile/{profile-name}"/>
-                <xml-property name="requiredProps" value="profile-name,profile-type,characteristics"/>
+                <xml-property name="requiredProps" value="profile-name,profile-type,profile-selflink"/>
              </xml-properties>
         </java-type>
 
@@ -14522,7 +14649,7 @@
 				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
             </xml-properties>
 		</java-type>
-		
+
 		<java-type name="ObjectGroups">
             <xml-properties>
                 <xml-property name="description" value="Collection of object-groups"/>
@@ -14590,14 +14717,14 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes an object-group"/>
-                <xml-property name="indexedProps" value="object-group-id,version,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="object-group-id,version,group-name,group-type,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="object-groups"/>
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="uriTemplate" value="/common/object-groups/object-group/{object-group-id}"/>
                 <xml-property name="requiredProps" value="object-group-id,group-type"/>
              </xml-properties>
         </java-type>
-        
+
         <java-type name="CommunityList">
             <xml-root-element name="community-list"/>
             <java-attributes>
@@ -14639,10 +14766,10 @@
                 <xml-property name="dependentOn" value="object-group"/>
                 <xml-property name="uriTemplate" value="/community-list/{community-value}"/>
                 <xml-property name="requiredProps" value="community-value"/>
-				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version,type"/>
             </xml-properties>
         </java-type>
-        
+
         <java-type name="IpAddressList">
             <xml-root-element name="ip-address-list"/>
             <java-attributes>
@@ -14709,9 +14836,9 @@
                 <xml-property name="dependentOn" value="endpoint,subnet,rule,policy,object-group"/>
                 <xml-property name="uriTemplate" value="/ip-address-list/{ip-address}"/>
                 <xml-property name="requiredProps" value="ip-address"/>
-				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="ip-address,data-owner,data-source,data-source-version,type"/>
             </xml-properties>
-        </java-type>        
+        </java-type>
 
         <java-type name="PortList">
             <xml-root-element name="port-list"/>
@@ -14764,7 +14891,7 @@
                 <xml-property name="dependentOn" value="endpoint,rule,object-group"/>
                 <xml-property name="uriTemplate" value="/port-list/{port}"/>
                 <xml-property name="requiredProps" value="port"/>
-				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version,type"/>
             </xml-properties>
         </java-type>
 
@@ -14814,7 +14941,7 @@
                 <xml-property name="dependentOn" value="rule,object-group,endpoint,policy"/>
                 <xml-property name="uriTemplate" value="/selector-list/{selector}"/>
                 <xml-property name="requiredProps" value="selector"/>
-				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version,type"/>
              </xml-properties>
         </java-type>
 
@@ -14918,6 +15045,11 @@
                     <xml-properties>
                         <xml-property name="description" value="Policy Variable Name"/>
                     </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="direction" name="direction" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="policy direction set as ingress or egress"/>
+                    </xml-properties>
                 </xml-element>
 				<xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
@@ -14934,7 +15066,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -14947,7 +15079,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of policy"/>
-                <xml-property name="indexedProps" value="policy-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="policy-id,version,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="policy-id"/>
                 <xml-property name="container" value="policies"/>
                 <xml-property name="namespace" value="common"/>
@@ -15065,6 +15197,7 @@
                 <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v24.IpAddressList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v24.PortList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v24.SelectorList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v24.Metadata"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
             </java-attributes>
             <xml-properties>
@@ -15073,7 +15206,7 @@
                 <xml-property name="dependentOn" value="policy"/>
                 <xml-property name="uriTemplate" value="/rules/rule/{rule-id}"/>
                 <xml-property name="requiredProps" value="rule-id,log"/>
-				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="sequence,version,data-owner,data-source,data-source-version,rule-id"/>
             </xml-properties>
         </java-type>
 
@@ -15142,7 +15275,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes an vlan characteristic"/>
-                <xml-property name="indexedProps" value="vlan-characteristic-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="vlan-characteristic-id,data-owner,data-source,data-source-version,applies-to"/>
                 <xml-property name="container" value="vlan-characteristics"/>
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="uriTemplate" value="/common/vlan-characteristics/vlan-characteristic/{vlan-characteristic-id}"/>
@@ -15210,7 +15343,6 @@
             <xml-properties>
                 <xml-property name="description" value="describes an relationship rule"/>
                 <xml-property name="indexedProps" value="rule-id,context,rule-traversals,applies-to,data-owner,data-source,data-source-version"/>
-                 <xml-property name="uniqueProps" value="rule-id"/>
                 <xml-property name="container" value="relationship-rules"/>
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="uriTemplate" value="/common/relationship-rules/relationship-rule/{rule-id}"/>
@@ -15348,7 +15480,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -15358,11 +15490,11 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services.  In 1902, SDNC will create aggregate-route objects and write them to A&amp;AI. "/>
-                <xml-property name="indexedProps" value="agg-route-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="agg-route-id,next-hop,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="aggregate-routes"/>
                 <xml-property name="dependentOn" value="vrf,l3-network"/>
                 <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/>
-            	<xml-property name="requiredProps" value="agg-route-id"/>            
+            	<xml-property name="requiredProps" value="agg-route-id"/>
             </xml-properties>
 		</java-type>
 		<java-type name="CommunicationServiceProfiles">
@@ -15432,7 +15564,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -15567,7 +15699,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -15717,7 +15849,7 @@
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </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."/>
@@ -15800,6 +15932,782 @@
                 <xml-property name="requiredProps" value="id,description,name,group,version,kind,namespace,selflink"/>
              </xml-properties>
         </java-type>
+        <java-type name="ParameterLists">
+            <xml-properties>
+                <xml-property name="description" value="Collection of parameter lists."/>
+            </xml-properties>
+            <xml-root-element name="parameter-lists"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="parameterList" name="parameter-list" type="inventory.aai.onap.org.v24.ParameterList"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ParameterList">
+            <xml-root-element name="parameter-list"/>
+            <java-attributes>
+                <xml-element java-attribute="parameterListId" name="parameter-list-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="parameterType" name="parameter-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="set to QoS"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="parameterRole" name="parameter-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="parameter role"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="parameterFunction" name="parameter-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="parameter function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="numeric indicating the sequence of the parameter"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="parameterName" name="parameter-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name of the parameter"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="parameterValue" name="parameter-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="numeric value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="parameterValueUnit" name="parameter-value-unit" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="unit of the value parameter, e.g. mbps, ms"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Parameter list associated with a policy key term"/>
+                <xml-property name="indexedProps" value="parameter-list-id,parameter-type,parameter-role,parameter-function,parameter-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="parameter-list-id"/>
+                <xml-property name="container" value="parameter-lists"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="nameProps" value="parameter-type"/>
+                <xml-property name="uriTemplate" value="/common/parameter-lists/parameter-list/{parameter-list-id}"/>
+                <xml-property name="requiredProps" value="parameter-list-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="ClassMapMembers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of class map members."/>
+            </xml-properties>
+            <xml-root-element name="class-map-members"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="classMapMember" name="class-map-member" type="inventory.aai.onap.org.v24.ClassMapMember"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ClassMapMember">
+            <xml-root-element name="class-map-member"/>
+            <java-attributes>
+                <xml-element java-attribute="classMapMemberId" name="class-map-member-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="numeric indicating the sequence of the member"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="memberType" name="member-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="valid values are action or end-class-map"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="action" name="action" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="valid value is match"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="actionType" name="action-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="describes the action-type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Member of a class map"/>
+                <xml-property name="indexedProps" value="class-map-member-id,member-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="class-map-member-id"/>
+                <xml-property name="container" value="class-map-members"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/class-map-members/class-map-member/{class-map-member-id}"/>
+                <xml-property name="requiredProps" value="class-map-member-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="ClassMaps">
+            <xml-properties>
+                <xml-property name="description" value="Collection of class maps."/>
+            </xml-properties>
+            <xml-root-element name="class-maps"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="classMap" name="class-map" type="inventory.aai.onap.org.v24.ClassMap"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ClassMap">
+            <xml-root-element name="class-map"/>
+            <java-attributes>
+                <xml-element java-attribute="classMapId" name="class-map-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="classMapName" name="class-map-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name of class-map"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="classMapType" name="class-map-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="valid values are TRAFFIC or default"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="classMapRole" name="class-map-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="valid values are MATCH-ALL or MATCH-ANY"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="classMapFunction" name="class-map-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="function of class-map"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="direction" name="direction" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="direction set as ingress or egress"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Class map related to a policy map member used for QOS"/>
+                <xml-property name="indexedProps" value="class-map-id,class-map-name,class-map-type,class-map-role,class-map-function,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="class-map-id"/>
+                <xml-property name="container" value="class-maps"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="nameProps" value="class-map-name"/>
+                <xml-property name="uriTemplate" value="/common/class-maps/class-map/{class-map-id}"/>
+                <xml-property name="requiredProps" value="class-map-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="PolicyKeyTerms">
+            <xml-properties>
+                <xml-property name="description" value="Collection of policy key terms."/>
+            </xml-properties>
+            <xml-root-element name="policy-key-terms"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="policyKeyTerm" name="policy-key-term" type="inventory.aai.onap.org.v24.PolicyKeyTerm"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="PolicyKeyTerm">
+            <xml-root-element name="policy-key-term"/>
+            <java-attributes>
+                <xml-element java-attribute="policyKeyTermId" name="policy-key-term-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="numeric indicating the sequence of the key term"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="keyWord" name="key-word" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="key word, for example police, set, priority level, shape"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="keyWordQualifier" name="key-word-qualifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="qualifier, for example rate, traffic class, avg percent"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Policy key term related to a policy map member"/>
+                <xml-property name="indexedProps" value="policy-key-term-id,key-word,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="policy-key-term-id"/>
+                <xml-property name="container" value="policy-key-terms"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/policy-key-terms/policy-key-term/{policy-key-term-id}"/>
+                <xml-property name="requiredProps" value="policy-key-term-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="PolicyMapMembers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of policy map members."/>
+            </xml-properties>
+            <xml-root-element name="policy-map-members"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="policyMapMember" name="policy-map-member" type="inventory.aai.onap.org.v24.PolicyMapMember"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="PolicyMapMember">
+            <xml-root-element name="policy-map-member"/>
+            <java-attributes>
+                <xml-element java-attribute="policyMapMemberId" name="policy-map-member-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicate the sequence of the member"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="memberType" name="member-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="valid values are QOS-CLASS or END-POLICY-MAP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="qosClassName" name="qos-class-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="used to map to the class-map"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="classType" name="class-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="valid value is traffic"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Member of a policy map used for QOS"/>
+                <xml-property name="indexedProps" value="policy-map-member-id,member-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="policy-map-member-id"/>
+                <xml-property name="container" value="policy-map-members"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/policy-map-members/policy-map-member/{policy-map-member-id}"/>
+                <xml-property name="requiredProps" value="policy-map-member-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="HoldTimers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of hold timers."/>
+            </xml-properties>
+            <xml-root-element name="hold-timers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="holdTimer" name="hold-timer" type="inventory.aai.onap.org.v24.HoldTimer"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="HoldTimer">
+            <xml-root-element name="hold-timer"/>
+            <java-attributes>
+                <xml-element java-attribute="holdTimerId" name="hold-timer-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID - unique object identifier"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="up" name="up" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="hold timer value for interface transition from down to up"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="down" name="down" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="hold timer value for interface transition from up to down"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="The hold timer enables interface damping by not advertising interface transitions until the hold timer duration has passed."/>
+                <xml-property name="indexedProps" value="hold-timer-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="p-interface"/>
+                <xml-property name="container" value="hold-timers"/>
+                <xml-property name="uriTemplate" value="/hold-timers/hold-timer/{hold-timer-id}"/>
+                <xml-property name="requiredProps" value="hold-timer-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="GigEtherOptions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of gig ether options."/>
+            </xml-properties>
+            <xml-root-element name="gig-ether-options"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="gigEtherOption" name="gig-ether-option" type="inventory.aai.onap.org.v24.GigEtherOption"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="GigEtherOption">
+            <xml-root-element name="gig-ether-option"/>
+            <java-attributes>
+                <xml-element java-attribute="gigEtherOptionId" name="gig-ether-option-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID - unique object identifier"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fec" name="fec" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Forward Error Correction Values: null, FEC91, and other future values"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="lacpOnBundleId" name="lacp-on-bundle-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="link aggregation control protocol on bundle id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="specifies any gigabit ethernet options associated with a p-interface."/>
+                <xml-property name="indexedProps" value="gig-ether-option-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="p-interface"/>
+                <xml-property name="container" value="gig-ether-options"/>
+                <xml-property name="uriTemplate" value="/gig-ether-options/gig-ether-option/{gig-ether-option-id}"/>
+                <xml-property name="requiredProps" value="gig-ether-option-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="TemporaryParameterLists">
+            <xml-properties>
+                <xml-property name="description" value="Collection of temporary parameter lists."/>
+            </xml-properties>
+            <xml-root-element name="temporary-parameter-lists"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="temporaryParameterList" name="temporary-parameter-list" type="inventory.aai.onap.org.v24.TemporaryParameterList"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="TemporaryParameterList">
+            <xml-root-element name="temporary-parameter-list"/>
+            <java-attributes>
+                <xml-element java-attribute="temporaryParameterListId" name="temporary-parameter-list-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID - unique object identifier"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="paramGroup" name="param-group" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="temporary parameter group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="paramName" name="param-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="temporary parameter name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="paramValue" name="param-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="temporary parameter value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Used to specify temporary parameters for p-interface, lag-interface, or l-interface objects."/>
+                <xml-property name="indexedProps" value="temporary-parameter-list-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="p-interface,l-interface,lag-interface"/>
+                <xml-property name="container" value="temporary-parameter-lists"/>
+                <xml-property name="uriTemplate" value="/temporary-parameter-lists/temporary-parameter-list/{temporary-parameter-list-id}"/>
+                <xml-property name="requiredProps" value="temporary-parameter-list-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="AggregatedEtherOptions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of aggregated ether options."/>
+            </xml-properties>
+            <xml-root-element name="aggregated-ether-options"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="aggregatedEtherOption" name="aggregated-ether-option" type="inventory.aai.onap.org.v24.AggregatedEtherOption"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="AggregatedEtherOption">
+            <xml-root-element name="aggregated-ether-option"/>
+            <java-attributes>
+                <xml-element java-attribute="aggregatedEtherOptionId" name="aggregated-ether-option-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID - unique object identifier"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+                <xml-element java-attribute="lacps" name="lacps" type="inventory.aai.onap.org.v24.Lacps"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Used to specify the aggregated Ethernet properties of a specific aggregated Ethernet interface."/>
+                <xml-property name="indexedProps" value="aggregated-ether-option-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="lag-interface"/>
+                <xml-property name="container" value="aggregated-ether-options"/>
+                <xml-property name="uriTemplate" value="/aggregated-ether-options/aggregated-ether-option/{aggregated-ether-option-id}"/>
+                <xml-property name="requiredProps" value="aggregated-ether-option-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="Lacps">
+            <xml-properties>
+                <xml-property name="description" value="Collection of lacps."/>
+            </xml-properties>
+            <xml-root-element name="lacps"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lacp" name="lacp" type="inventory.aai.onap.org.v24.Lacp"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="Lacp">
+            <xml-root-element name="lacp"/>
+            <java-attributes>
+                <xml-element java-attribute="lacpId" name="lacp-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID- unique object identifier"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="systemId" name="system-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="LACP system identifier at the aggregated Ethernet interface level"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mode" name="mode" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="specifies the state of the interface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="periodic" name="periodic" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="periodic transmission rate"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Used to specify Link Aggregation Control Protocol attributes."/>
+                <xml-property name="indexedProps" value="lacp-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="aggregated-ether-option"/>
+                <xml-property name="container" value="lacps"/>
+                <xml-property name="uriTemplate" value="/lacps/lacp/{lacp-id}"/>
+                <xml-property name="requiredProps" value="lacp-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="Esis">
+            <xml-properties>
+                <xml-property name="description" value="Collection of esis."/>
+            </xml-properties>
+            <xml-root-element name="esis"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="esi" name="esi" type="inventory.aai.onap.org.v24.Esi"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="Esi">
+            <xml-root-element name="esi"/>
+            <java-attributes>
+                <xml-element java-attribute="esiId" name="esi-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="object identifier"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activeOption" name="active-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Values: null, all-active, single-active"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="specifies Ethernet Segment Identifier associated with a lag-interface."/>
+                <xml-property name="indexedProps" value="esi-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="lag-interface"/>
+                <xml-property name="container" value="esis"/>
+                <xml-property name="uriTemplate" value="/esis/esi/{esi-id}"/>
+                <xml-property name="requiredProps" value="esi-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="LcmpUnreachables">
+            <xml-properties>
+                <xml-property name="description" value="Collection of lcmp unreachables."/>
+            </xml-properties>
+            <xml-root-element name="lcmp-unreachables"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lcmpUnreachable" name="lcmp-unreachable" type="inventory.aai.onap.org.v24.LcmpUnreachable"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="LcmpUnreachable">
+            <xml-root-element name="lcmp-unreachable"/>
+            <java-attributes>
+                <xml-element java-attribute="lcmpUnreachableId" name="lcmp-unreachable-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="object identifier"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="afIpv4" name="af-ipv4" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values: null, disable, enable"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="afIpv6" name="af-ipv6" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv6 address family Values: null, disable, enable"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v24.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages"/>
+                <xml-property name="indexedProps" value="lcmp-unreachable-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="lcmp-unreachables"/>
+                <xml-property name="uriTemplate" value="/lcmp-unreachables/lcmp-unreachable/{lcmp-unreachable-id}"/>
+                <xml-property name="requiredProps" value="lcmp-unreachable-id"/>
+            </xml-properties>
+        </java-type>
 	</java-types>
 </xml-bindings>
 
-- 
2.16.6