From a040eac14a18d96df4dc4729df506ce993cad090 Mon Sep 17 00:00:00 2001
From: ALPERT <ma1944@att.com>
Date: Wed, 13 Jan 2021 10:28:31 -0500
Subject: Pushing v22 schema to onap

Making changes to DbEdgeRules_v22 and aai_oxm_v22 to update with approved changes

Issue-ID: AAI-3196
Change-Id: I1d896060abdd55fa315f4eb7e1589cbcbd2a5b67
Signed-off-by: Alpert, Matthew (ma1944) <ma1944@att.com>
---
 .../onap/dbedgerules/v22/DbEdgeRules_v22.json      |  524 +++-
 .../main/resources/onap/oxm/v22/aai_oxm_v22.xml    | 2634 ++++++++++++++++++--
 2 files changed, 2977 insertions(+), 181 deletions(-)

(limited to 'aai-schema/src')

diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v22/DbEdgeRules_v22.json b/aai-schema/src/main/resources/onap/dbedgerules/v22/DbEdgeRules_v22.json
index 1e748e2..9018996 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v22/DbEdgeRules_v22.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v22/DbEdgeRules_v22.json
@@ -936,6 +936,18 @@
 			"default": "true",
 			"description": ""
 		},
+		{
+			"from": "service-instance",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
 		{
 			"from": "service-instance",
 			"to": "p-interface",
@@ -1922,7 +1934,7 @@
 			"delete-other-v": "!${direction}",
 			"prevent-delete": "NONE",
 			"default": "true",
-			"description": ""
+			"description":"service-instance BelongsTo service-subscription"
 		},
 		{
 			"from": "class-of-service",
@@ -2787,8 +2799,8 @@
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description": ""
-		},
-		{
+        },
+        {
 			"from": "allotted-resource",
 			"to": "model-ver",
 			"label": "org.onap.relationships.inventory.IsA",
@@ -2799,8 +2811,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}",
 			"private": "true"
-		},
-		{
+        },
+        {
 			"from": "configuration",
 			"to": "model-ver",
 			"label": "org.onap.relationships.inventory.IsA",
@@ -2817,7 +2829,7 @@
 			"to": "model-ver",
 			"label": "org.onap.relationships.inventory.IsA",
 			"direction": "OUT",
-			"multiplicity": "MANY2ONE",
+            "multiplicity": "MANY2ONE",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
@@ -4720,7 +4732,8 @@
 			"delete-other-v": "!${direction}",
 			"prevent-delete": "NONE",
 			"default": "true",
-			"description": ""
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]			
 		},
 		{
 			"from": "network-range",
@@ -4958,7 +4971,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true",
-			"description": "A pnf uses policies"
+			"description": "A pnf uses policies",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
 		},
 		{
 			"from": "pnf",
@@ -4996,7 +5010,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}",
 			"default": "true",
-			"description": "A policy applies to an address family."
+			"description": "A policy applies to an address family.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]	
 		},
 		{
 			"from": "policy",
@@ -5034,7 +5049,8 @@
 			"delete-other-v": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true",
-			"description": "The policy associated to an instance-group"
+			"description": "The policy associated to an instance-group",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]	
 		},
 		{
 			"from": "policy",
@@ -5060,7 +5076,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true",
-			"description": "The policy applies to an l-interface."
+			"description": "The policy applies to an l-interface.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]	
 		},
 		{
 			"from": "policy",
@@ -5086,7 +5103,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}",
 			"default": "true",
-			"description": "This edge allows for QOS policy to vlan-tag relationship. For a given policy get all vlan tags as well as for a given vlan-tag get all the policies."
+			"description": "This edge allows for QOS policy to vlan-tag relationship. For a given policy get all vlan tags as well as for a given vlan-tag get all the policies.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]	
 		},
 		{
 			"from": "policy",
@@ -5112,7 +5130,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true",
-			"description": ""
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]	
 		},
 		{
 			"from": "port-list",
@@ -5293,7 +5312,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}",
 			"default": "true",
-			"description": "A profile (set of characteristics) applies to the lag-interface."
+			"description": "A profile (set of characteristics) applies to the lag-interface.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
 		},
 		{
 			"from": "profile",
@@ -5306,7 +5326,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}",
 			"default": "true",
-			"description": "A profile (set of characteristics) applies to the l-interface."
+			"description": "A profile (set of characteristics) applies to the l-interface.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]	
 		},
 		{
 			"from": "profile",
@@ -5358,7 +5379,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}",
 			"default": "true",
-			"description": "A profile (set of characteristics) applies to the p-interface."
+			"description": "A profile (set of characteristics) applies to the p-interface.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]	
 		},
 		{
 			"from": "profile",
@@ -5384,7 +5406,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}",
 			"default": "true",
-			"description": "A profile (set of characteristics) applies to the pnf."
+			"description": "A profile (set of characteristics) applies to the pnf.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
 		},
 		{
 			"from": "profile",
@@ -5397,7 +5420,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}",
 			"default": "true",
-			"description": "A profile (set of characteristics) applies to the policy."
+			"description": "A profile (set of characteristics) applies to the policy.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]	
 		},
 		{
 			"from": "profile",
@@ -5488,7 +5512,8 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "${direction}",
 			"default": "true",
-			"description": "A profile (set of characteristics) applies to the vrf."
+			"description": "A profile (set of characteristics) applies to the vrf.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]	
 		},
 		{
 			"from": "pserver",
@@ -5736,7 +5761,8 @@
 			"delete-other-v": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true",
-			"description": "The profile associated to a sw-component"
+			"description": "The profile associated to a sw-component",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]	
 		},
 		{
 			"from": "validation-audit",
@@ -5859,7 +5885,461 @@
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description": ""
-		}
-
+		},
+		{
+			"from": "selector-list",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "zone",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},	
+        {
+            "from": "generic-vnf",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":"A relationship that ties the device to the prefix-list/community-list."
+        },
+		{
+			"from": "pnf",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},
+		{
+			"from": "port-list",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "selector-list",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "mapping",
+			"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": "The mapping associated to an object-group"
+		},
+		{
+			"from": "complex",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "relationship-rule",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "Details relationships endpoint requires"
+		},
+		{
+			"from": "policy",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},
+		{
+			"from": "object-group",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The object-group is located in a complex"
+		},
+		{
+			"from": "pserver",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},	
+		{
+			"from": "relationship-rule",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "Details relationships object-group requires"
+		},	
+		{
+			"from": "object-group",
+			"to": "vrf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The object-group to VRF for various route types.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},		
+		{
+			"from": "profile",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "A profile (set of characteristics) applies to the endpoint."
+		},
+		{
+			"from": "cloud-region",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "object-group",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The object-gorup that applies to an object-group"
+		},	
+		{
+			"from": "object-group",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The object-group is located in a cloud-region"
+		},	
+		{
+			"from": "rule",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},
+		{
+			"from": "rule",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},
+		{
+			"from": "rule",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},
+		{
+			"from": "rule",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "false",
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},	
+		{
+			"from": "profile",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The profile (set of characteristics) classifies the object-group.",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},
+		{
+			"from": "object-group",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The object-group is located in a zone"
+		},
+		{
+			"from": "network-route",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description": "The route is part of part of a route-list that is modeled in an object-group."
+		},
+		{
+			"from": "ip-address-list",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},				
+		{
+			"from": "object-group",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "",
+			"relationship-properties": ["data-owner","data-source","data-source-version"]
+		},
+		{
+			"from": "community-list",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "port-list",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		},
+		{
+			"from": "service-instance",
+			"to": "owning-entity",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":"service-instance Uses an owning-entity"
+		},{
+			"from": "vrf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Primary",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "false",
+			"description":"used for vrf fallback"
+		},{
+			"from": "vrf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.Secondary",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "false",
+			"description":"used for vrf fallback"
+		},{
+			"from": "platform",
+			"to": "profile",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"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": "platform",
+			"to": "endpoint",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"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": "platform",
+			"to": "object-group",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"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": "platform",
+			"to": "policy",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object"
+		}	
 	]
 }
diff --git a/aai-schema/src/main/resources/onap/oxm/v22/aai_oxm_v22.xml b/aai-schema/src/main/resources/onap/oxm/v22/aai_oxm_v22.xml
index 52e66b5..3d52c1e 100644
--- a/aai-schema/src/main/resources/onap/oxm/v22/aai_oxm_v22.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v22/aai_oxm_v22.xml
@@ -409,6 +409,7 @@
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
+                               <xml-property name="searchable" value="sdnc-id"/>
                                <xml-property name="container" value="esr-thirdparty-sdnc-list"/>
                                <xml-property name="namespace" value="external-system"/>
                        		   <xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -639,6 +640,7 @@
                 <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v22.CloudRegions"/>
                 <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v22.NetworkProfiles"/>
                 <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v22.Pservers"/>
+                <xml-element java-attribute="endpoints" name="endpoints" type="inventory.aai.onap.org.v22.Endpoints"/>        
                 <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v22.VirtualDataCenters"/>
                 <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v22.OperationalEnvironments"/>
                 <xml-element java-attribute="geoRegions" name="geo-regions" type="inventory.aai.onap.org.v22.GeoRegions"/>
@@ -743,6 +745,11 @@
                     <xml-properties>
                         <xml-property name="description" value="Upgrade cycle for the cloud region. For AIC regions upgrade cycle is designated by A,B,C etc."/>
                     </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
                 </xml-element>
                     <xml-element java-attribute="orchestrationDisabled" name="orchestration-disabled" required="true" type="java.lang.Boolean" default-value="false">
                     <xml-properties>
@@ -756,9 +763,19 @@
                         <xml-property name="description" value="Used to indicate whether or not cloud-region object is in maintenance mode."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </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="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v22.VolumeGroups"/>
@@ -786,7 +803,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"/>
+                <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="nameProps" value="owner-defined-type"/>
                 <xml-property name="container" value="cloud-regions"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
@@ -818,6 +835,21 @@
                         <xml-property name="description" value="Name of the host-aggregate."/>
                     </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-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."/>
@@ -831,6 +863,7 @@
                 <xml-property name="container" value="host-aggregates"/>
                 <xml-property name="uriTemplate" value="/host-aggregates/host-aggregate/{host-aggregate-id}"/>
                 <xml-property name="requiredProps" value="host-aggregate-id,host-aggregate-name"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
 	         </xml-properties>
         </java-type>
 
@@ -866,6 +899,21 @@
                         <xml-property name="description" value="vlan 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-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."/>
@@ -876,7 +924,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of vlan range"/>
-                <xml-property name="indexedProps" value="vlan-range-id,vlan-type"/>
+                <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="container" value="vlan-ranges"/>
                 <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/>
@@ -933,6 +981,21 @@
                         <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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."/>
@@ -942,7 +1005,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Persistent block-level storage."/>
-                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id,orchestration-status"/>
+                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id,orchestration-status,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="volume-group-id,volume-group-name"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="volume-groups"/>
@@ -1063,6 +1126,21 @@
                         <xml-property name="description" value="The time zone where the complex is located."/>
                     </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-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="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"/>
@@ -1081,7 +1159,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
-                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id"/>
+                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code"/>
                 <xml-property name="uniqueProps" value="physical-location-id"/>
                 <xml-property name="container" value="complexes"/>
@@ -1127,6 +1205,21 @@
                         <xml-property name="description" 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-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."/>
@@ -1139,7 +1232,7 @@
             <xml-properties>
                 <xml-property name="description" value="Definition of rack"/>
                 <xml-property name="uniqueProps" value="rack-name"/>
-                <xml-property name="indexedProps" 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"/>
                 <xml-property name="uriTemplate" value="/racks/rack/{rack-name}"/>
@@ -1167,6 +1260,21 @@
                         <xml-property name="description" value="The type of cable."/>
                     </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-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."/>
@@ -1176,7 +1284,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of cable"/>
-                <xml-property name="indexedProps" value="cable-name"/>
+                <xml-property name="indexedProps" value="cable-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="complex"/>
                 <xml-property name="container" value="cables"/>
                 <xml-property name="uriTemplate" value="/cables/cable/{cable-name}"/>
@@ -1199,6 +1307,21 @@
                         <xml-property name="description" value="A unique name for the rack-unit (within the rack)."/>
                     </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-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."/>
@@ -1208,7 +1331,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of rack-unit"/>
-                <xml-property name="indexedProps" value="rack-unit-name"/>
+                <xml-property name="indexedProps" value="rack-unit-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="rack"/>
                 <xml-property name="container" value="rack-units"/>
                 <xml-property name="uriTemplate" value="/rack-units/rack-unit/{rack-unit-name}"/>
@@ -1236,6 +1359,21 @@
                         <xml-property name="description" value="The type of pdu."/>
                     </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-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."/>
@@ -1246,7 +1384,7 @@
             <xml-properties>
                 <xml-property name="description" value="Definition of pdu"/>
                 <xml-property name="uniqueProps" value="pdu-name"/>
-                <xml-property name="indexedProps" value="pdu-name"/>
+                <xml-property name="indexedProps" value="pdu-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="rack"/>
                 <xml-property name="container" value="pdus"/>
                 <xml-property name="uriTemplate" value="/pdus/pdu/{pdu-name}"/>
@@ -1284,6 +1422,21 @@
                         <xml-property name="description" value="Comma separated list of ctags"/>
                     </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-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."/>
@@ -1293,7 +1446,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose."/>
-                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="indexedProps" value="availability-zone-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="complex"/>
                 <xml-property name="container" value="ctag-pools"/>
                 <xml-property name="uriTemplate" value="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}"/>
@@ -1346,7 +1499,22 @@
                     <xml-properties>
                         <xml-property name="description" value="Support Model"/>
                     </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."/>
+                    </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."/>
@@ -1359,7 +1527,7 @@
             <xml-properties>
                 <xml-property name="description" value="Openstack tenant"/>
                 <xml-property name="nameProps" value="tenant-name"/>
-                <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context"/>
+                <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="tenant-id,tenant-name"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="tenants"/>
@@ -1412,6 +1580,21 @@
                         <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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."/>
@@ -1421,7 +1604,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="nos-server is the execution environment that will have images, certain versions of VNOS, running on it."/>
-                <xml-property name="indexedProps" value="nos-server-id,prov-status"/>
+                <xml-property name="indexedProps" value="nos-server-id,prov-status,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="tenant"/>
                 <xml-property name="nameProps" value="nos-server-name"/>
                 <xml-property name="container" value="nos-servers"/>
@@ -1485,6 +1668,21 @@
                         <xml-property name="description" value="Non-uniform memory access optimization, helps prevent memory-bandwidth bottlenecks. Expected values - 1 or 2 identifying memory access"/>
                     </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-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."/>
@@ -1503,7 +1701,7 @@
             <xml-properties>
                 <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
                 <xml-property name="nameProps" value="vserver-name"/>
-                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,vserver-name2"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,vserver-name2,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2,operational-status"/>
                 <xml-property name="dependentOn" value="tenant"/>
                 <xml-property name="container" value="vservers"/>
@@ -1629,7 +1827,21 @@
                         <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="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-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="vlans" name="vlans" type="inventory.aai.onap.org.v22.Vlans"/>
                 <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v22.SriovVfs"/>
                 <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v22.LInterfaces"/>
@@ -1644,7 +1856,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
-                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name,interface-type,interface-function,interface-role,prov-status"/>
+                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name,interface-type,interface-function,interface-role,prov-status,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface,pnf,pserver"/>
                 <xml-property name="nameProps" value="interface-type"/>
                 <xml-property name="container" value="l-interfaces"/>
@@ -1726,6 +1938,21 @@
                         <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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."/>
@@ -1740,7 +1967,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
-                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id"/>
+                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="l-interface"/>
                 <xml-property name="container" value="sriov-vfs"/>
                 <xml-property name="uriTemplate" value="/sriov-vfs/sriov-vf/{pci-id}"/>
@@ -1796,11 +2023,26 @@
                         <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPv4 Address Range"/>
-                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="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="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"/>
@@ -1895,13 +2137,28 @@
                         <xml-property name="description" value="Private VLAN indicator."/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v22.L3InterfaceIpv4AddressList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v22.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of vlan"/>
-                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key,orchestration-status,prov-status"/>
+                <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="dependentOn" value="l-interface"/>
                 <xml-property name="container" value="vlans"/>
                 <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
@@ -1957,11 +2214,26 @@
                         <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPv6 Address Range"/>
-                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="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="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"/>
@@ -1991,6 +2263,21 @@
                         <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </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-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."/>
@@ -2000,7 +2287,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Ephemeral Block storage volume."/>
-                <xml-property name="indexedProps" value="volume-id"/>
+                <xml-property name="indexedProps" value="volume-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="vserver"/>
                 <xml-property name="container" value="volumes"/>
                 <xml-property name="uriTemplate" value="/volumes/volume/{volume-id}"/>
@@ -2076,6 +2363,21 @@
 						<xml-property name="description" value="List of flavor specific HPA Capabilities"/>
 					</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-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."/>
@@ -2086,7 +2388,7 @@
             <xml-properties>
                 <xml-property name="description" value="Openstack flavor."/>
                 <xml-property name="nameProps" value="flavor-name"/>
-                <xml-property name="indexedProps" value="flavor-name,flavor-id"/>
+                <xml-property name="indexedProps" value="flavor-name,flavor-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="flavors"/>
                 <xml-property name="uriTemplate" value="/flavors/flavor/{flavor-id}"/>
@@ -2157,18 +2459,33 @@
                         <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
                     </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-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>                
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack snapshot"/>
                 <xml-property name="nameProps" value="snapshot-name"/>
                 <xml-property name="uniqueProps" value="snapshot-id"/>
-                <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id"/>
+                <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="snapshots"/>
                 <xml-property name="uriTemplate" value="/snapshots/snapshot/{snapshot-id}"/>
@@ -2209,6 +2526,21 @@
                         <xml-property name="description" value="Group description - description of the group"/>
                     </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-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."/>
@@ -2219,7 +2551,7 @@
             <xml-properties>
                 <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)."/>
                 <xml-property name="nameProps" value="group-name"/>
-                <xml-property name="indexedProps" value="group-id,group-type,group-name"/>
+                <xml-property name="indexedProps" value="group-id,group-type,group-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="group-id,group-name"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="group-assignments"/>
@@ -2286,6 +2618,21 @@
                         <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </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-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."/>
@@ -2297,7 +2644,7 @@
             <xml-properties>
                 <xml-property name="description" value="Openstack image."/>
                 <xml-property name="nameProps" value="image-name"/>
-                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version"/>
+                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="images"/>
                 <xml-property name="uriTemplate" value="/images/image/{image-id}"/>
@@ -2320,6 +2667,21 @@
             <java-attributes>
                 <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
                 <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="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-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."/>
@@ -2328,7 +2690,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Key/value pairs"/>
-                <xml-property name="indexedProps" value="metaname"/>
+                <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="container" value="metadata"/>
                 <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
@@ -2359,6 +2721,21 @@
                         <xml-property name="description" value="URL used to reach the vcenter"/>
                     </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-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."/>
@@ -2368,7 +2745,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
-                <xml-property name="indexedProps" value="vcenter-url,switch-name"/>
+                <xml-property name="indexedProps" value="vcenter-url,switch-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="dvs-switches"/>
                 <xml-property name="uriTemplate" value="/dvs-switches/dvs-switch/{switch-name}"/>
@@ -2399,6 +2776,21 @@
                         <xml-property name="description" value="Encrypted SNMP community string"/>
                     </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-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."/>
@@ -2408,7 +2800,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Network profile populated by SDN-GP for SNMP"/>
-                <xml-property name="indexedProps" value="nm-profile-name"/>
+                <xml-property name="indexedProps" value="nm-profile-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="network-profiles"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-property name="uriTemplate" value="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}"/>
@@ -2583,6 +2975,21 @@
                         <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </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-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="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."/>
@@ -2599,7 +3006,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"/>
+                <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="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address,operational-status"/>
                 <xml-property name="uniqueProps" value="hostname"/>
                 <xml-property name="container" value="pservers"/>
@@ -2771,6 +3178,21 @@
                         <xml-property name="description" value="connect interdomain link"/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v22.SriovPfs"/>
                 <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v22.LInterfaces"/>
@@ -2780,7 +3202,8 @@
             </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-role,interface-name2"/>
+                <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="uiEditableProps" value="prov-status,port-description"/>
                 <xml-property name="nameProps" value="prov-status"/>
                 <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
                 <xml-property name="container" value="p-interfaces"/>
@@ -2869,20 +3292,109 @@
                         <xml-property name="description" value="Minimum links in service before a LAG should be taken out of service"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v22.LInterfaces"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v22.L3InterfaceIpv4AddressList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v22.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"/>
-                <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/>
-                <xml-property name="container" value="lag-interfaces"/>
-                <xml-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
+                <xml-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-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="interfaceType" name="interface-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to identify the type of lag-interface."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v22.LInterfaces"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v22.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v22.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="uiEditableProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/>
+                <xml-property name="container" value="lag-interfaces"/>
+                <xml-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
                 <xml-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."/>
+            </xml-properties>
+            <xml-root-element name="endpoints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="endpoint" name="endpoint" type="inventory.aai.onap.org.v22.Endpoint"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Endpoint">
+            <xml-root-element name="endpoint"/>
+            <java-attributes>
+                <xml-element java-attribute="endpointId" name="endpoint-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier for the endpoint."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="endpointName" name="endpoint-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the endpoint."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="endpointType" name="endpoint-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the endpoint. Expected values are DNS, ETCD, Kubernetes, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="endpointName2" name="endpoint-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of the endpoint"/>
+                    </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-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.v22.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v22.IpAddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v22.PortList"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v22.SelectorList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an endpoints"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="container" value="endpoints"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/endpoints/endpoint/{endpoint-id}"/>
+                <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 name="Activities">
             <xml-properties>
@@ -2957,6 +3469,21 @@
                         <xml-property name="description" value="Date/time expires"/>
                     </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-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."/>
@@ -2972,6 +3499,7 @@
                 <xml-property name="container" value="activities"/>
                 <xml-property name="uriTemplate" value="/activities/activity/{activity-id}"/>
                 <xml-property name="requiredProps" value="activity-id,activity-type"/>
+				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
              </xml-properties>
         </java-type>
 
@@ -3008,6 +3536,21 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
@@ -3017,6 +3560,7 @@
                 <xml-property name="container" value="activity-states"/>
                 <xml-property name="uriTemplate" value="/activity-states/activity-state/{state-order}"/>
                 <xml-property name="requiredProps" value="state-order,state-name"/>
+				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
              </xml-properties>
         </java-type>
 
@@ -3231,6 +3775,26 @@
                         <xml-property name="description" value="Bridge domain group name"/>
                     </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-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="bestExternal" name="best-external" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies best-external vrf, best-external=Y if the conditions are met.  otherwise, best-external = N"/>
+                    </xml-properties>
+                </xml-element>                
                 <xml-element java-attribute="bgpGroups" name="bgp-groups" type="inventory.aai.onap.org.v22.BgpGroups"/>
                 <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v22.BgpNeighbors"/>
                 <xml-element java-attribute="aggregateRoutes" name="aggregate-routes" type="inventory.aai.onap.org.v22.AggregateRoutes"/>
@@ -3239,7 +3803,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of vrf"/>
-                <xml-property name="indexedProps" value="vrf-id,vrf-role,vrf-function"/>
+                <xml-property name="indexedProps" value="vrf-id,vrf-role,vrf-function,data-owner,data-source,data-source-version"/>
                 <xml-property name="nameProps" value="vrf-name"/>
                 <xml-property name="dependentOn" value="pnf"/>
                 <xml-property name="container" value="vrfs"/>
@@ -3286,6 +3850,21 @@
                         <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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."/>
@@ -3296,7 +3875,7 @@
             <xml-properties>
                 <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
                 <xml-property name="nameProps" value="network-name"/>
-                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name"/>
+                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="oam-networks"/>
                 <xml-property name="uriTemplate" value="/oam-networks/oam-network/{network-uuid}"/>
@@ -3336,6 +3915,21 @@
                         <xml-property name="description" value="Phase in the lifecycle of the configuration"/>
                     </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-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."/>
@@ -3345,7 +3939,7 @@
            </java-attributes>
               <xml-properties>
                 <xml-property name="description" value="validation audit, value of validation status"/>
-                <xml-property name="indexedProps" value="validation-id"/>
+                <xml-property name="indexedProps" value="validation-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="validation-id"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="validation-audits"/>
@@ -3382,6 +3976,21 @@
                         <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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."/>
@@ -3391,7 +4000,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers"/>
-                <xml-property name="indexedProps" value="availability-zone-name"/>
+                <xml-property name="indexedProps" value="availability-zone-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="availability-zones"/>
                 <xml-property name="uriTemplate" value="/availability-zones/availability-zone/{availability-zone-name}"/>
@@ -3422,6 +4031,21 @@
                         <xml-property name="description" value="Name of the virtual data center"/>
                     </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-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."/>
@@ -3432,7 +4056,7 @@
             <xml-properties>
                 <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
                 <xml-property name="nameProps" value="vdc-name"/>
-                <xml-property name="indexedProps" value="vdc-name,vdc-id"/>
+                <xml-property name="indexedProps" value="vdc-name,vdc-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="virtual-data-centers"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-property name="uriTemplate" value="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}"/>
@@ -3490,6 +4114,21 @@
                         <xml-property name="description" value="Description of the project."/>
                     </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-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."/>
@@ -3499,7 +4138,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes the project"/>
-                <xml-property name="indexedProps" value="project-name"/>
+                <xml-property name="indexedProps" value="project-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="project-name"/>
                 <xml-property name="container" value="projects"/>
                 <xml-property name="namespace" value="business"/>
@@ -3558,12 +4197,27 @@
                         <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v22.Metadata"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
-                <xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version"/>
+                <xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="connectors"/>
                 <xml-property name="namespace" value="business"/>
                 <xml-property name="uriTemplate" value="/business/connectors/connector/{resource-instance-id}"/>
@@ -3603,6 +4257,21 @@
                         <xml-property name="defaultValue" value="CUST"/>
                     </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-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."/>
@@ -3614,7 +4283,7 @@
             <xml-properties>
                 <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
                 <xml-property name="nameProps" value="subscriber-name"/>
-                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type"/>
+                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="global-customer-id,subscriber-name"/>
                 <xml-property name="uniqueProps" value="global-customer-id"/>
                 <xml-property name="container" value="customers"/>
@@ -3642,6 +4311,21 @@
                         <xml-property name="description" value="Name of the line-of-business (product)"/>
                     </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-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."/>
@@ -3651,7 +4335,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes a line-of-business"/>
-                <xml-property name="indexedProps" value="line-of-business-name"/>
+                <xml-property name="indexedProps" value="line-of-business-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="line-of-business-name"/>
                 <xml-property name="container" value="lines-of-business"/>
                 <xml-property name="namespace" value="business"/>
@@ -3683,6 +4367,21 @@
                         <xml-property name="description" value="Owning entity name"/>
                     </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-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."/>
@@ -3692,7 +4391,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes an owning-entity"/>
-                <xml-property name="indexedProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="indexedProps" value="owning-entity-id,owning-entity-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="owning-entity-id"/>
                 <xml-property name="uniqueProps" value="owning-entity-id,owning-entity-name"/>
                 <xml-property name="container" value="owning-entities"/>
@@ -3720,6 +4419,21 @@
                         <xml-property name="description" value="Name of the platform"/>
                     </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-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."/>
@@ -3729,7 +4443,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes a platform"/>
-                <xml-property name="indexedProps" value="platform-name"/>
+                <xml-property name="indexedProps" value="platform-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="platform-name"/>
                 <xml-property name="container" value="platforms"/>
                 <xml-property name="namespace" value="business"/>
@@ -3761,6 +4475,21 @@
                         <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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."/>
@@ -3772,7 +4501,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Object that group service instances."/>
-                <xml-property name="indexedProps" value="service-type"/>
+                <xml-property name="indexedProps" value="service-type,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="customer"/>
                 <xml-property name="container" value="service-subscriptions"/>
                 <xml-property name="crossEntityReference" value="service-instance,service-type"/>
@@ -3954,6 +4683,21 @@
                         <xml-property name="description" value="String capturing function of the service."/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v22.Metadata"/>
                 <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v22.AllottedResources"/>
@@ -3969,7 +4713,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Instance of a service"/>
-                <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context"/>
+                <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context,data-owner,data-source,data-source-version"/>
                 <xml-property name="nameProps" value="service-instance-name"/>
                 <xml-property name="searchable" value="service-instance-id,service-instance-name,operational-status"/>
                 <xml-property name="uniqueProps" value="service-instance-id"/>
@@ -4032,6 +4776,21 @@
                         <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </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-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."/>
@@ -4041,7 +4800,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
-                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version"/>
+                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="vnf-image-uuid"/>
                 <xml-property name="container" value="vnf-images"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
@@ -4088,11 +4847,26 @@
                         <xml-property name="description" value="service version"/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services."/>
-                <xml-property name="indexedProps" value="service-description,service-id"/>
+                <xml-property name="indexedProps" value="service-description,service-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="services"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/services/service/{service-id}"/>
@@ -4123,6 +4897,21 @@
                         <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
                     </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-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."/>
@@ -4132,7 +4921,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
-                <xml-property name="indexedProps" value="service-type,vnf-type"/>
+                <xml-property name="indexedProps" value="service-type,vnf-type,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="service-capabilities"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}"/>
@@ -4307,6 +5096,21 @@
                         <xml-property name="description" value="Used to categorize the configuration."/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v22.Metadata"/>
                 <xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v22.ForwarderEvcs"/>
@@ -4314,7 +5118,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Generic configuration object."/>
-                <xml-property name="indexedProps" value="configuration-id,configuration-name,configuration-type,model-invariant-id,model-version-id,orchestration-status,configuration-role,configuration-function,orchestration-version"/>
+                <xml-property name="indexedProps" value="configuration-id,configuration-name,configuration-type,model-invariant-id,model-version-id,orchestration-status,configuration-role,configuration-function,orchestration-version,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="configuration-id"/>
                 <xml-property name="container" value="configurations"/>
                 <xml-property name="namespace" value="network"/>
@@ -4464,11 +5268,26 @@
                         <xml-property name="description" value="The function performed by this logical link"/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/>
-				<xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,link-function,link-type,purpose,operational-status"/>
+				<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="uniqueProps" value="link-id"/>
                 <xml-property name="container" value="logical-links"/>
                 <xml-property name="namespace" value="network"/>
@@ -4496,6 +5315,21 @@
                         <xml-property name="description" value="Unique id of site pair set."/>
                     </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-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."/>
@@ -4506,7 +5340,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
-                <xml-property name="indexedProps" value="site-pair-set-id"/>
+                <xml-property name="indexedProps" value="site-pair-set-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="site-pair-set-id"/>
                 <xml-property name="container" value="site-pair-sets"/>
                 <xml-property name="namespace" value="network"/>
@@ -4538,6 +5372,21 @@
                         <xml-property name="description" value="rpm owner"/>
                     </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-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."/>
@@ -4547,7 +5396,8 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="routing-instance-id"/>
+            	<xml-property name="description" value="Collection of routing tables, interfaces, and routing protocol parameters."/>
+                <xml-property name="indexedProps" value="routing-instance-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="site-pair-set"/>
                 <xml-property name="container" value="routing-instances"/>
                 <xml-property name="uriTemplate" value="/routing-instances/routing-instance/{routing-instance-id}"/>
@@ -4597,16 +5447,31 @@
                         <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    </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="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v22.ClassesOfService"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="site-pair-id"/>
+                <xml-property name="indexedProps" value="site-pair-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="site-pair-id"/>
                 <xml-property name="dependentOn" value="routing-instance"/>
                 <xml-property name="container" value="site-pairs"/>
@@ -4642,6 +5507,21 @@
                         <xml-property name="description" value="type of probe"/>
                     </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-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."/>
@@ -4650,7 +5530,8 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="cos"/>
+            	<xml-property name="description" value="Captures data and voice protocols to differentiate the types of payloads contained in the packet being transmitted."/>
+                <xml-property name="indexedProps" value="cos,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="site-pair"/>
                 <xml-property name="container" value="classes-of-service"/>
                 <xml-property name="uriTemplate" value="/classes-of-service/class-of-service/{cos}"/>
@@ -4814,6 +5695,31 @@
                         <xml-property name="description" value="A variable BGP max AS path length."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="maxPathsV4" name="max-paths-v4" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="stores maximum number of paths for IPv4."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPathsV6" name="max-paths-v6" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="stores maximum number of paths for IPv6."/>
+                    </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-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="routeTargets" name="route-targets" type="inventory.aai.onap.org.v22.RouteTargets"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList">
                     <xml-properties>
@@ -4824,7 +5730,7 @@
             <xml-properties>
                 <xml-property name="description" value="VPN binding"/>
                 <xml-property name="nameProps" value="vpn-name,vpn-type"/>
-                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status,model-invariant-id,model-version-id"/>
+                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="vpn-id,vpn-name"/>
                 <xml-property name="uniqueProps" value="vpn-id"/>
                 <xml-property name="container" value="vpn-bindings"/>
@@ -4868,6 +5774,21 @@
                         <xml-property name="description" value="Temporary location for stag to get to VCE"/>
                     </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-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."/>
@@ -4879,7 +5800,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="VPLS Provider Edge routers."/>
-                <xml-property name="indexedProps" value="prov-status,equipment-name"/>
+                <xml-property name="indexedProps" value="prov-status,equipment-name,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}"/>
@@ -4915,6 +5836,21 @@
                         <xml-property name="description" value="rp type of multicast configuration"/>
                     </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-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."/>
@@ -4923,7 +5859,8 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="multicast-configuration-id"/>
+	            <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"/>
                 <xml-property name="namespace" value="network"/>
@@ -5039,6 +5976,21 @@
                         <xml-property name="description" value="OBSOLETE -  see child relationships"/>
                     </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-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="portGroups" name="port-groups" type="inventory.aai.onap.org.v22.PortGroups"/>
                 <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v22.Licenses"/>
                 <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v22.Entitlements"/>
@@ -5047,8 +5999,7 @@
             <xml-properties>
                 <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
                 <xml-property name="nameProps" value="vnf-name"/>
-		<xml-property name="indexedProps" 
-                              value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
                 <xml-property name="uniqueProps" value="vnf-id"/>
                 <xml-property name="container" value="vces"/>
@@ -5124,14 +6075,28 @@
                         <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v22.CvlanTags"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
                 <xml-property name="nameProps" value="port-group-name"/>
-		<xml-property name="indexedProps" 
-                              value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/>
+                <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="dependentOn" value="vce"/>
                 <xml-property name="container" value="port-groups"/>
                 <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -5154,6 +6119,21 @@
                         <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
                     </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-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."/>
@@ -5163,7 +6143,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="dependentOn" value="port-group"/>
-                <xml-property name="indexedProps" value="cvlan-tag"/>
+                <xml-property name="indexedProps" value="cvlan-tag,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="cvlan-tags"/>
                 <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/>
             </xml-properties>
@@ -5251,6 +6231,21 @@
                         <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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."/>
@@ -5262,7 +6257,7 @@
                 <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v22.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id,orchestration-status"/>
+                <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id,orchestration-status,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="vnfc-name"/>
                 <xml-property name="container" value="vnfcs"/>
                 <xml-property name="namespace" value="network"/>
@@ -5444,6 +6439,21 @@
                         <xml-property name="description" value="The function performed by this l3 network"/>
                     </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-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="subnets" name="subnets" type="inventory.aai.onap.org.v22.Subnets"/>
                 <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v22.CtagAssignments"/>
                 <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v22.SegmentationAssignments"/>
@@ -5457,8 +6467,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"/>
+                <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="searchable" value="network-id,network-name"/>
                 <xml-property name="uniqueProps" value="network-id"/>
                 <xml-property name="container" value="l3-networks"/>
@@ -5491,6 +6500,21 @@
                         <xml-property name="description" value="ID for the openStack Heat instance"/>
                     </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-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."/>
@@ -5529,8 +6553,9 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.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="nameProps" value="network-policy-fqdn"/>
-                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn,data-owner,data-source,data-source-version"/>
                 <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"/>
@@ -5553,6 +6578,21 @@
                         <xml-property name="description" value="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-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."/>
@@ -5561,7 +6601,7 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="vlan-id-inner"/>
+                <xml-property name="indexedProps" value="vlan-id-inner,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="l3-network"/>
                 <xml-property name="container" value="ctag-assignments"/>
                 <xml-property name="uriTemplate" value="/ctag-assignments/ctag-assignment/{vlan-id-inner}"/>
@@ -5679,12 +6719,28 @@
                         <xml-property name="description" value="sequence of the subnet"/>
                     </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-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="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v22.HostRoutes"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v22.IpAddressList"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v22.BgpNeighbors"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="subnet-id,subnet-name,subnet-type,subnet-function,orchestration-status"/>
+                <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="nameProps" value="subnet-name"/>
                 <xml-property name="uniqueProps" value="subnet-id"/>
                 <xml-property name="dependentOn" value="l3-network,zone"/>
@@ -6021,6 +7077,21 @@
                         <xml-property name="description" value="vnf application-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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v22.LInterfaces"/>
                 <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v22.LagInterfaces"/>
@@ -6033,7 +7104,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"/>
+                <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="searchable" value="vnf-id,vnf-name,vnf-name2,operational-status"/>
                 <xml-property name="uniqueProps" value="vnf-id"/>
                 <xml-property name="container" value="generic-vnfs"/>
@@ -6150,6 +7221,21 @@
                         <xml-property name="description" value="Path to the controller object."/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
@@ -6160,7 +7246,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="a deployment unit of VNFCs"/>
-                <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn,orchestration-status"/>
+                <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn,orchestration-status,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="vf-module-id,vf-module-name,operational-status"/>
                 <xml-property name="dependentOn" value="generic-vnf"/>
                 <xml-property name="container" value="vf-modules"/>
@@ -6188,6 +7274,21 @@
                         <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
                     </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-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."/>
@@ -6197,7 +7298,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="LAG links can connect lag-interfaces"/>
-                <xml-property name="indexedProps" value="link-name"/>
+                <xml-property name="indexedProps" value="link-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="lag-links"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/lag-links/lag-link/{link-name}"/>
@@ -6288,13 +7389,28 @@
                         <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v22.LInterfaces"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
                 <xml-property name="nameProps" value="vnf-name"/>
-                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2,orchestration-status"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2,orchestration-status,data-owner,data-source,data-source-version"/>
                 <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2"/>
                 <xml-property name="uniqueProps" value="vnf-id2"/>
                 <xml-property name="container" value="newvces"/>
@@ -6441,6 +7557,12 @@
                         <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="spareEquipmentIndicator" name="spare-equipment-indicator" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                    	<xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag for identifying spare equipment"/>
+                    </xml-properties>
+                </xml-element>                     
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
@@ -6528,6 +7650,26 @@
                         <xml-property name="description" value="This is the IP address (IPv6) for the PNF itself. This is the IPv6 address that the PNF iself can be accessed at."/>
                     </xml-properties>
                 </xml-element>
+				<xml-element java-attribute="phoneNumber" name="phone-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the POTS phone number used to connect to a pnf out-of-band via dial-up."/>
+                    </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-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="softwareVersions" name="software-versions" type="inventory.aai.onap.org.v22.SoftwareVersions"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v22.PInterfaces"/>
@@ -6540,7 +7682,7 @@
             </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"/>
+                <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="searchable" value="pnf-name"/>
                 <xml-property name="uniqueProps" value="pnf-name"/>
                 <xml-property name="container" value="pnfs"/>
@@ -6630,6 +7772,21 @@
                         <xml-property name="description" value="Reflects the admin-state of the device."/>
                     </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-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."/>
@@ -6644,7 +7801,7 @@
             <xml-properties>
                 <xml-property name="description" value="Definition of chassis"/>
                 <xml-property name="uniqueProps" value="chassis-name"/>
-                <xml-property name="indexedProps" value="chassis-name,part-number,orchestration-status,equip-model,equip-vendor,equip-identifier"/>
+                <xml-property name="indexedProps" value="chassis-name,part-number,orchestration-status,equip-model,equip-vendor,equip-identifier,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="chassies"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/chassies/chassis/{chassis-name}"/>
@@ -6712,6 +7869,21 @@
                         <xml-property name="description" value="Port range end"/>
                     </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-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."/>
@@ -6721,7 +7893,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of port"/>
-                <xml-property name="indexedProps" value="port-name"/>
+                <xml-property name="indexedProps" value="port-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="chassis,pluggable,card"/>
                 <xml-property name="container" value="ports"/>
                 <xml-property name="uriTemplate" value="/ports/port/{port-name}"/>
@@ -6746,6 +7918,21 @@
                         <xml-property name="description" value="The name of the card-slot (unique relative to the chassis)."/>
                     </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-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."/>
@@ -6756,7 +7943,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of card-slot"/>
-                <xml-property name="indexedProps" value="slot-name"/>
+                <xml-property name="indexedProps" value="slot-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="chassis"/>
                 <xml-property name="container" value="card-slots"/>
                 <xml-property name="uriTemplate" value="/card-slots/card-slot/{slot-name}"/>
@@ -6779,6 +7966,21 @@
                         <xml-property name="description" value="The type of card."/>
                     </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-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."/>
@@ -6790,7 +7992,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of card"/>
-                <xml-property name="indexedProps" value="card-type"/>
+                <xml-property name="indexedProps" value="card-type,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="card-slot"/>
                 <xml-property name="container" value="cards"/>
                 <xml-property name="uriTemplate" value="/cards/card/{card-type}"/>
@@ -6815,6 +8017,21 @@
                         <xml-property name="description" value="The name of the pluggable-slot. (unique relative to the chassis or card)."/>
                     </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-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."/>
@@ -6825,7 +8042,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of card-slot"/>
-                <xml-property name="indexedProps" value="slot-name"/>
+                <xml-property name="indexedProps" value="slot-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="chassis,card"/>
                 <xml-property name="container" value="pluggable-slots"/>
                 <xml-property name="uriTemplate" value="/pluggable-slots/pluggable-slot/{slot-name}"/>
@@ -6858,6 +8075,21 @@
                         <xml-property name="description" value="CLEI or other specification for pluggable hardware."/>
                     </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-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."/>
@@ -6868,7 +8100,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of pluggable"/>
-                <xml-property name="indexedProps" value="pluggable-type,part-number,equip-identifier"/>
+                <xml-property name="indexedProps" value="pluggable-type,part-number,equip-identifier,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="pluggable-slot"/>
                 <xml-property name="container" value="pluggables"/>
                 <xml-property name="uriTemplate" value="/pluggables/pluggable/{pluggable-type}"/>
@@ -7002,6 +8234,21 @@
                         <xml-property name="description" value="Subtype used to categorize this physical link"/>
                     </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-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="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."/>
@@ -7012,7 +8259,7 @@
             </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"/>
+                <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="alternateKeys1" value="circuit-id"/>
                 <xml-property name="container" value="physical-links"/>
                 <xml-property name="namespace" value="network"/>
@@ -7047,6 +8294,21 @@
                         <xml-property name="description" value="v6 IP of the vig server"/>
                     </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-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."/>
@@ -7056,7 +8318,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607"/>
-                <xml-property name="indexedProps" value="vig-address-type"/>
+                <xml-property name="indexedProps" value="vig-address-type,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="ipsec-configuration"/>
                 <xml-property name="container" value="vig-servers"/>
                 <xml-property name="uriTemplate" value="/vig-servers/vig-server/{vig-address-type}"/>
@@ -7179,6 +8441,21 @@
                         <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is 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-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."/>
@@ -7189,7 +8466,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
-                <xml-property name="indexedProps" value="ipsec-configuration-id"/>
+                <xml-property name="indexedProps" value="ipsec-configuration-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
                 <xml-property name="container" value="ipsec-configurations"/>
                 <xml-property name="namespace" value="network"/>
@@ -7285,7 +8562,7 @@
             <xml-properties>
                 <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version"/>
                 <xml-property name="nameProps" value="model-type"/>
-                <xml-property name="indexedProps" value="model-invariant-id,model-type"/>
+                <xml-property name="indexedProps" value="model-invariant-id,model-type,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="model-invariant-id"/>
                 <xml-property name="container" value="models"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
@@ -7308,6 +8585,21 @@
                         <xml-property name="description" value="Role of the model,e.g.,NST,NSST,CST,etc"/>
                     </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-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."/>
@@ -7331,7 +8623,7 @@
             <xml-properties>
                 <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models"/>
                 <xml-property name="nameProps" value="model-name"/>
-                <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status"/>
+                <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="model-version-id"/>
                 <xml-property name="dependentOn" value="model"/>
                 <xml-property name="container" value="model-vers"/>
@@ -7374,6 +8666,21 @@
                         <xml-property name="description" value="The version of the CDS blue print."/>
                     </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-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."/>
@@ -7396,7 +8703,7 @@
             <xml-properties>
                 <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
                 <xml-property name="uniqueProps" value="model-element-uuid"/>
-                <xml-property name="indexedProps" value="model-element-uuid"/>
+                <xml-property name="indexedProps" value="model-element-uuid,data-owner,data-source,data-source-version"/>
                 <xml-property name="allowDirectRead" value="true"/>
                 <xml-property name="dependentOn" value="element-choice-set,model-element,model-ver"/>
                 <xml-property name="allowDirectWrite" value="false"/>
@@ -7438,6 +8745,21 @@
                         <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
         </java-type>
@@ -7453,7 +8775,7 @@
             <xml-properties>
                 <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
                 <xml-property name="uniqueProps" value="model-constraint-uuid"/>
-                <xml-property name="indexedProps" value="model-constraint-uuid"/>
+                <xml-property name="indexedProps" value="model-constraint-uuid,data-owner,data-source,data-source-version"/>
                 <xml-property name="allowDirectRead" value="true"/>
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="dependentOn" value="model-element"/>
@@ -7468,6 +8790,21 @@
                         <xml-property name="autoGenerateUuid" value="true"/>
                     </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-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="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
                 <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v22.ConstrainedElementSets"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -7489,7 +8826,7 @@
             <xml-properties>
                 <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
                 <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
-                <xml-property name="indexedProps" value="constrained-element-set-uuid"/>
+                <xml-property name="indexedProps" value="constrained-element-set-uuid,data-owner,data-source,data-source-version"/>
                 <xml-property name="allowDirectRead" value="true"/>
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="dependentOn" value="model-constraint,model-element"/>
@@ -7504,6 +8841,21 @@
                         <xml-property name="autoGenerateUuid" value="true"/>
                     </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-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="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"/>
@@ -7523,7 +8875,7 @@
             <xml-properties>
                 <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
                 <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
-                <xml-property name="indexedProps" value="element-choice-set-uuid"/>
+                <xml-property name="indexedProps" value="element-choice-set-uuid,data-owner,data-source,data-source-version"/>
                 <xml-property name="allowDirectRead" value="true"/>
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="dependentOn" value="constrained-element-set"/>
@@ -7538,6 +8890,21 @@
                         <xml-property name="autoGenerateUuid" value="true"/>
                     </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-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="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
                 <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
@@ -7890,6 +9257,21 @@
                         <xml-property name="description" value="FQDN entry in the route table."/>
                     </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-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="Concurrency value"/>
@@ -7902,7 +9284,7 @@
                 <xml-property name="description" value="Openstack route table reference."/>
                 <xml-property name="nameProps" value="route-table-reference-fqdn"/>
                 <xml-property name="uniqueProps" value="route-table-reference-id"/>
-                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="route-table-references"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/route-table-references/route-table-reference/{route-table-reference-id}"/>
@@ -7991,6 +9373,21 @@
                         <xml-property name="description" value="Used to identify the primary and secondary priority"/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
 
@@ -7999,7 +9396,7 @@
                 <xml-property name="nameProps" value="description,instance-group-name"/>
                 <xml-property name="uniqueProps" value="id"/>
                 <xml-property name="searchable" value="id,description"/>
-                <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/>
+                <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="instance-groups"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
@@ -8026,6 +9423,21 @@
                         <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
                     </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-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="Concurrency value"/>
@@ -8035,7 +9447,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Openstack segmentation assignment."/>
-                <xml-property name="indexedProps" value="segmentation-id"/>
+                <xml-property name="indexedProps" value="segmentation-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="l3-network"/>
                 <xml-property name="container" value="segmentation-assignments"/>
                 <xml-property name="uriTemplate" value="/segmentation-assignments/segmentation-assignment/{segmentation-id}"/>
@@ -8153,6 +9565,21 @@
 						<xml-property name="description" value="Store the vpn-name of this allotted-resource."/>
 					</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-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="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v22.TunnelXconnects"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
@@ -8160,8 +9587,7 @@
             <xml-properties>
                 <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted"/>
 				<xml-property name="nameProps" value="description,allotted-resource-name"/>
-                <xml-property name="uniqueProps" value="id"/>
-				<xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name,orchestration-status"/>
+				<xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name,orchestration-status,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="service-instance"/>
                 <xml-property name="container" value="allotted-resources"/>
                 <!--  <xml-property name="namespace" value="network" /> -->
@@ -8188,6 +9614,21 @@
                         <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
                     </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-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="Concurrency value"/>
@@ -8198,8 +9639,7 @@
 
             <xml-properties>
                 <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted"/>
-                <xml-property name="uniqueProps" value="id"/>
-                <xml-property name="indexedProps" value="id"/>
+                <xml-property name="indexedProps" value="id,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="allotted-resource"/>
                 <xml-property name="container" value="tunnel-xconnects"/>
                 <!--  <xml-property name="namespace" value="network" /> -->
@@ -8275,6 +9715,21 @@
                         <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </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-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."/>
@@ -8285,7 +9740,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of bgp-group"/>
-                <xml-property name="indexedProps" value="bgp-group-id"/>
+                <xml-property name="indexedProps" value="bgp-group-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="pnf,vrf,generic-vnf"/>
                 <xml-property name="nameProps" value="bgp-group-id,bgp-group-name"/>
                 <xml-property name="container" value="bgp-groups"/>
@@ -8358,7 +9813,7 @@
                 </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="provisioning status. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                        <xml-property name="description" value="provisioning status. Valid values [PREPROV/NVTPROV/PROV]."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="peerHostname" name="peer-hostname" type="java.lang.String">
@@ -8366,6 +9821,21 @@
                         <xml-property name="description" value="hostname of the peer"/>
                     </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-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."/>
@@ -8376,7 +9846,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of bgp-neighbor"/>
-                <xml-property name="indexedProps" value="bgp-neighbor-id"/>
+                <xml-property name="indexedProps" value="bgp-neighbor-id,data-owner,data-source,data-source-version"/>
                 <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"/>
@@ -8422,6 +9892,36 @@
                         <xml-property name="description" value="function of address-family"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="maxPrefixV4" name="max-prefix-v4" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix for IPv4"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixV6" name="max-prefix-v6" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix for IPv6"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPrefixThreshold" name="max-prefix-threshold" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Max prefix threshold"/>
+                    </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-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."/>
@@ -8431,7 +9931,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of address family"/>
-                <xml-property name="indexedProps" value="address-family-id,af-type"/>
+                <xml-property name="indexedProps" value="address-family-id,af-type,data-owner,data-source,data-source-version"/>
                 <xml-property name="nameProps" value="address-family-id,af-type"/>
                 <xml-property name="dependentOn" value="bgp-group,bgp-neighbor"/>
                 <xml-property name="container" value="address-families"/>
@@ -8463,6 +9963,21 @@
                         <xml-property name="description" value="Unique ID of an entitlement resource. "/>
                     </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-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="Concurrency value"/>
@@ -8472,7 +9987,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Metadata for entitlement group."/>
-                <xml-property name="indexedProps" value="group-uuid,resource-uuid"/>
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="generic-vnf,vce"/>
                 <xml-property name="container" value="entitlements"/>
                 <xml-property name="uriTemplate" value="/entitlements/entitlement/{group-uuid}/{resource-uuid}"/>
@@ -8518,6 +10033,21 @@
                     <xml-properties>
                         <xml-property name="description" value="Date of receipt."/>
                     </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-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>
@@ -8528,7 +10058,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Metadata for license group."/>
-                <xml-property name="indexedProps" value="group-uuid,resource-uuid,project-number,order-number,receipt-date"/>
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid,project-number,order-number,receipt-date,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="chassis,generic-vnf,vce"/>
                 <xml-property name="container" value="licenses"/>
                 <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
@@ -8608,6 +10138,21 @@
                         <xml-property name="description" value="Function of a zone."/>
                     </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-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="Concurrency value"/>
@@ -8625,7 +10170,7 @@
             <xml-properties>
                 <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB"/>
                 <xml-property name="nameProps" value="zone-name"/>
-                <xml-property name="indexedProps" value="zone-id,design-type,zone-context"/>
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="zone-id"/>
                 <xml-property name="container" value="zones"/>
                 <xml-property name="namespace" value="network"/>
@@ -8672,6 +10217,21 @@
                         <xml-property name="description" value="role of autonomous system"/>
                     </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-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="Concurrency value"/>
@@ -8682,7 +10242,7 @@
             <xml-properties>
                 <xml-property name="description" value="Description of Autonomous System"/>
                 <xml-property name="nameProps" value="autonomous-system-id,autonomous-system-number"/>
-                <xml-property name="indexedProps" value="autonomous-system-id,autonomous-system-number,autonomous-system-type"/>
+                <xml-property name="indexedProps" value="autonomous-system-id,autonomous-system-number,autonomous-system-type,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="autonomous-system-id"/>
                 <xml-property name="container" value="autonomous-systems"/>
                 <xml-property name="namespace" value="network"/>
@@ -8754,6 +10314,21 @@
                         <xml-property name="description" value="Prefix of network range."/>
                     </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-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="Concurrency value"/>
@@ -8765,7 +10340,7 @@
             <xml-properties>
                 <xml-property name="description" value="Description of Network Range"/>
                 <xml-property name="nameProps" value="network-range-name,network-range-type"/>
-                <xml-property name="indexedProps" value="network-range-id,network-range-name"/>
+                <xml-property name="indexedProps" value="network-range-id,network-range-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="network-ranges"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/network-ranges/network-range/{network-range-id}"/>
@@ -8833,7 +10408,7 @@
                 </xml-element>
 				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Provision status for the mapping object. Valid values can be found at (https://wiki.web.att.com/display/SPTIIRP/prov-status)."/>
+                        <xml-property name="description" value="Provision status for the mapping object. Valid values [PREPROV/NVTPROV/PROV]."/>
                     </xml-properties>
                 </xml-element>
 				<xml-element java-attribute="homedLocation" name="homed-location" type="java.lang.String">
@@ -8846,12 +10421,27 @@
                         <xml-property name="description" value="Location the object is planned for"/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="General mechanism for mapping between instances; cg-nat."/>
-                <xml-property name="indexedProps" value="mapping-id"/>
+                <xml-property name="indexedProps" value="mapping-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="mapping-id"/>
                 <xml-property name="container" value="mappings"/>
                 <xml-property name="namespace" value="network"/>
@@ -8897,6 +10487,21 @@
                         <xml-property name="description" value="Function of hardware component"/>
                     </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-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."/>
@@ -8906,7 +10511,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="create/update/delete the hw-component node"/>
-                <xml-property name="indexedProps" value="hw-component-id"/>
+                <xml-property name="indexedProps" value="hw-component-id,data-owner,data-source,data-source-version"/>
             	<xml-property name="uriTemplate" value="/network/hw-components/hw-component/{hw-component-id}"/>
             	<xml-property name="requiredProps" value="hw-component-id"/>
             	<xml-property name="namespace" value="network"/>
@@ -8951,6 +10556,21 @@
                         <xml-property name="description" value="Function of software component"/>
                     </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-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."/>
@@ -8960,7 +10580,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="create/update/delete the sw-component node"/>
-				<xml-property name="indexedProps" value="sw-component-id"/>
+				<xml-property name="indexedProps" value="sw-component-id,data-owner,data-source,data-source-version"/>
             	<xml-property name="uriTemplate" value="/network/sw-components/sw-component/{sw-component-id}"/>
 				<xml-property name="requiredProps" value="sw-component-id"/>
 				<xml-property name="namespace" value="network"/>
@@ -9035,6 +10655,21 @@
                         <xml-property name="description" value="whether the route address is ipv4, ipv6."/>
                     </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-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."/>
@@ -9044,7 +10679,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="This object represents a network route. For instance, host-route, static-route."/>
-				<xml-property name="indexedProps" value="route-id,type,role,function,ip-address,prefix-length,next-hop"/>
+				<xml-property name="indexedProps" value="route-id,type,role,function,ip-address,prefix-length,next-hop,data-owner,data-source,data-source-version"/>
             	<xml-property name="uriTemplate" value="/network/network-routes/network-route/{route-id}"/>
 				<xml-property name="requiredProps" value="route-id,type,role,function,ip-address,prefix-length,address-family"/>
 				<xml-property name="namespace" value="network"/>
@@ -9104,6 +10739,21 @@
                         <xml-property name="description" value="Cost that is associated with using the route."/>
                     </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-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."/>
@@ -9113,7 +10763,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"/>
+                <xml-property name="indexedProps" value="next-hop-id,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}"/>
@@ -9164,6 +10814,21 @@
                         <xml-property name="description" value="bfd timeout parameter"/>
                     </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-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."/>
@@ -9173,7 +10838,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="BFD (Bidirectional Forwarding Detection) is a protocol for detecting link failures.The BFD object is for persisting attributes for the links that have BFD enabled."/>
-                <xml-property name="indexedProps" value="bfd-id"/>
+                <xml-property name="indexedProps" value="bfd-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="namespace" value="network"/>
 				<xml-property name="container" value="bfds"/>
                 <xml-property name="uriTemplate" value="/network/bfds/bfd/{bfd-id}"/>
@@ -9220,6 +10885,21 @@
                         <xml-property name="description" value="Domain name."/>
                     </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-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."/>
@@ -9230,7 +10910,7 @@
             <xml-properties>
                 <xml-property name="description" value="A fully qualified domain name (FQDN) is the complete domain name for a specific computer, or host, on the internet."/>
                 <xml-property name="requiredProps" value="fqdn,dns-domain"/>
-				<xml-property name="indexedProps" value="fqdn"/>
+				<xml-property name="indexedProps" value="fqdn,data-owner,data-source,data-source-version"/>
                 <xml-property name="namespace" value="network"/>
 				<xml-property name="container" value="fqdns"/>
                 <xml-property name="uriTemplate" value="/network/fqdns/fqdn/{fqdn}"/>
@@ -9259,6 +10939,21 @@
                         <xml-property name="description" value="Role assigned to this route target"/>
                     </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-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."/>
@@ -9272,7 +10967,8 @@
                 <xml-property name="dependentOn" value="vpn-binding,vrf"/>
                 <xml-property name="canBeLinked" value="true"/>
                 <xml-property name="uriTemplate" value="/route-targets/route-target/{global-route-target}/{route-target-role}"/>
-            <xml-property name="requiredProps" value="global-route-target,route-target-role"/>
+                <xml-property name="requiredProps" value="global-route-target,route-target-role"/>
+				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
             </xml-properties>
         </java-type>
 
@@ -9293,6 +10989,21 @@
                         <xml-property name="description" value="Identifier for the sriov-pf"/>
                     </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-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."/>
@@ -9302,7 +11013,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="SR-IOV Physical Function"/>
-                <xml-property name="indexedProps" value="pf-pci-id"/>
+                <xml-property name="indexedProps" value="pf-pci-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="p-interface"/>
                 <xml-property name="container" value="sriov-pfs"/>
                 <xml-property name="uriTemplate" value="/sriov-pfs/sriov-pf/{pf-pci-id}"/>
@@ -9344,6 +11055,21 @@
                         <xml-property name="description" value="Value that is assigned to an IP route for a particular network interface that identifies the cost that is associated with using that route."/>
                     </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-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."/>
@@ -9352,7 +11078,8 @@
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="host-route-id"/>
+	            <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="dependentOn" value="subnet"/>
                 <xml-property name="container" value="host-routes"/>
                 <xml-property name="uriTemplate" value="/host-routes/host-route/{host-route-id}"/>
@@ -9407,11 +11134,26 @@
                         <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPv4 Address Range"/>
-                <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,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"/>
@@ -9466,11 +11208,26 @@
                         <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="IPv6 Address Range"/>
-                <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
+                <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,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"/>
@@ -9523,6 +11280,21 @@
                         <xml-property name="description" value="Workload Context."/>
                     </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-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."/>
@@ -9532,7 +11304,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"/>
+                <xml-property name="indexedProps" value="operational-environment-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="nameProps" value="operational-environment-name"/>
                 <xml-property name="uniqueProps" value="operational-environment-id"/>
                 <xml-property name="container" value="operational-environments"/>
@@ -9553,7 +11325,7 @@
             <xml-root-element name="forwarding-path"/>
             <xml-properties>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name"/>
+                <xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
                 <xml-property name="container" value="forwarding-paths"/>
                 <xml-property name="nameProps" value="forwarding-path-name"/>
@@ -9583,6 +11355,21 @@
                         <xml-property name="description" value="the self link for this FP"/>
                     </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-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="forwarders" name="forwarders" type="inventory.aai.onap.org.v22.Forwarders"/>
             </java-attributes>
         </java-type>
@@ -9597,7 +11384,7 @@
         <java-type name="Forwarder">
             <xml-root-element name="forwarder"/>
             <xml-properties>
-                <xml-property name="indexedProps" value="sequence"/>
+                <xml-property name="indexedProps" value="sequence,data-owner,data-source,data-source-version"/>
                 <xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
                 <xml-property name="container" value="forwarders"/>
                 <xml-property name="dependentOn" value="forwarding-path"/>
@@ -9616,6 +11403,21 @@
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
+                <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-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."/>
@@ -9659,6 +11461,21 @@
                         <xml-property name="description" value="CVLAN value for ingress of egress forwarder."/>
                     </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-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="vlanMappings" name="vlan-mappings" type="inventory.aai.onap.org.v22.VlanMappings"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -9674,7 +11491,7 @@
                 <xml-property name="container" value="forwarder-evcs"/>
                 <xml-property name="uriTemplate" value="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}"/>
                 <xml-property name="requiredProps" value="forwarder-evc-id"/>
-                <xml-property name="indexedProps" value="circuit-id"/>
+                <xml-property name="indexedProps" value="circuit-id,data-owner,data-source,data-source-version"/>
             </xml-properties>
         </java-type>
 
@@ -9716,6 +11533,21 @@
                         <xml-property name="description" value="The internal VLAN ('IVLAN') value.  Specific to Arista devices."/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
             </java-attributes>
@@ -9725,7 +11557,8 @@
                 <xml-property name="uniqueProps" value="vlan-mapping-id"/>
                 <xml-property name="container" value="vlan-mappings"/>
                 <xml-property name="uriTemplate" value="/vlan-mappings/vlan-mapping/{vlan-mapping-id}"/>
-            <xml-property name="requiredProps" value="vlan-mapping-id"/>
+            	<xml-property name="requiredProps" value="vlan-mapping-id"/>
+            	<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
             </xml-properties>
         </java-type>
 
@@ -9759,6 +11592,11 @@
                         <xml-property name="description" value="CIR units"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="cmtu" name="cmtu" type="java.lang.Integer">
+                	<xml-properties>
+                		<xml-property name="description" value="Size of the Customer Requested MTU (Maximum Transmission Unit)."/>
+                	</xml-properties>
+                </xml-element>         
                 <xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Diversity Group ID"/>
@@ -9769,6 +11607,11 @@
                         <xml-property name="description" value="formerly Performance Group"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="enhancedMulticast" name="enhanced-multicast" type="java.lang.String">
+                	<xml-properties>
+                		<xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values:yes/no/[empty string]"/>
+                	</xml-properties>
+                </xml-element>
                 <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="EVC Circuit ID of ESP EVC"/>
@@ -9814,6 +11657,21 @@
                         <xml-property name="description" value="Product 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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
@@ -9827,7 +11685,8 @@
                 <xml-property name="uniqueProps" value="evc-id"/>
                 <xml-property name="container" value="evcs"/>
                 <xml-property name="uriTemplate" value="/evcs/evc/{evc-id}"/>
-            <xml-property name="requiredProps" value="evc-id"/>
+            	<xml-property name="requiredProps" value="evc-id"/>
+            	<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
             </xml-properties>
         </java-type>
 
@@ -9893,6 +11752,21 @@
                         <xml-property name="description" value="Captures the id of all the configuration used to customize the resource for the service"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
@@ -9904,7 +11778,7 @@
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="description" value="represents the collection resource in the TOSCA model"/>
                 <xml-property name="uniqueProps" value="collection-id"/>
-                <xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id,orchestration-status"/>
+                <xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id,orchestration-status,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="collections"/>
                 <xml-property name="uriTemplate" value="/network/collections/collection/{collection-id}"/>
             <xml-property name="requiredProps" value="collection-id"/>
@@ -9934,6 +11808,21 @@
                         <xml-property name="description" value="port index to represent multiple CPs on VNFC connected to same network."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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" required="false" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
@@ -9944,12 +11833,13 @@
                 <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v22.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="| SE group | This object captures the point of attachment from services or resources to a virtual link or network. | A&amp;AI clients for this object are typically: DCAE-DTI, (DMaaP-DCAE,...) |"/>
+                <xml-property name="description" value="Captures the point of attachment from services or resources to a virtual link or network."/>
                 <xml-property name="uniqueProps" value="cp-instance-id"/>
                 <xml-property name="dependentOn" value="vnfc"/>
                 <xml-property name="container" value="cps"/>
                 <xml-property name="uriTemplate" value="/cps/cp/{cp-instance-id}"/>
-            <xml-property name="requiredProps" value="cp-instance-id"/>
+				<xml-property name="requiredProps" value="cp-instance-id"/>
+				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
             </xml-properties>
         </java-type>
 
@@ -9990,19 +11880,34 @@
                         <xml-property name="description" value="is private flag."/>
                     </xml-properties>
                 </xml-element>
-				<xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String">
+				<xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VLAN tag Type"/>
+                    </xml-properties>
+                </xml-element>
+				<xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VLAN Tag Function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The config-phase associated with this vlan-tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="VLAN tag Type"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                     </xml-properties>
                 </xml-element>
-				<xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String">
+				<xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="VLAN Tag Function"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String">
+				<xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The config-phase associated with this vlan-tag"/>
+                        <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">
@@ -10018,6 +11923,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-properties>
         </java-type>
 
@@ -10059,6 +11965,21 @@
                         <xml-property name="description" value="Function of geo-region"/>
                     </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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
             </java-attributes>
@@ -10099,6 +12020,21 @@
                         <xml-property name="description" value="The network-technology  that a cloud-region can support. Current valid values- CONTRAIL AIC_SR_IOV OVS STANDARD-SR-IOV"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="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-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."/>
@@ -10113,7 +12049,8 @@
                 <xml-property name="container" value="network-technologies"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-property name="uriTemplate" value="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}"/>
-            <xml-property name="requiredProps" value="network-technology-id,network-technology-name"/>
+				<xml-property name="requiredProps" value="network-technology-id,network-technology-name"/>
+				<xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
             </xml-properties>
         </java-type>
 
@@ -11557,7 +13494,8 @@
             <java-attributes>
             	<xml-element java-attribute="hardwareCatalogItems" name="hardware-catalog-items" type="inventory.aai.onap.org.v22.HardwareCatalogItems"/>
             	<xml-element java-attribute="contacts" name="contacts" type="inventory.aai.onap.org.v22.Contacts"/>
-              <xml-element java-attribute="profiles" name="profiles" type="inventory.aai.onap.org.v22.Profiles"/>
+                <xml-element java-attribute="profiles" name="profiles" type="inventory.aai.onap.org.v22.Profiles"/>
+				<xml-element java-attribute="objectGroups" name="object-groups" type="inventory.aai.onap.org.v22.ObjectGroups"/>              
 				<xml-element java-attribute="policies" name="policies" type="inventory.aai.onap.org.v22.Policies"/>
 				<xml-element java-attribute="vlanCharacteristics" name="vlan-characteristics" type="inventory.aai.onap.org.v22.VlanCharacteristics"/>
 				<xml-element java-attribute="relationshipRules" name="relationship-rules" type="inventory.aai.onap.org.v22.RelationshipRules"/>
@@ -11612,6 +13550,21 @@
                         <xml-property name="description" value="Stock-keeping-unit (ATT specific identifier for the hardware-catalog-item)"/>
                     </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-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."/>
@@ -11621,7 +13574,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes an hardware-catalog-items"/>
-                <xml-property name="indexedProps" value="item-name"/>
+                <xml-property name="indexedProps" value="item-name,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="item-name"/>
                 <xml-property name="container" value="hardware-catalog-items"/>
                 <xml-property name="namespace" value="common"/>
@@ -11678,6 +13631,21 @@
                         <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </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-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."/>
@@ -11688,7 +13656,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes an profiles"/>
-                <xml-property name="indexedProps" value="profile-name,profile-role,profile-function"/>
+                <xml-property name="indexedProps" value="profile-name,profile-role,profile-function,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="profile-name"/>
 				<xml-property name="nameProps" value="profile-type"/>
                 <xml-property name="container" value="profiles"/>
@@ -11731,6 +13699,21 @@
                         <xml-property name="description" value="NI (Network Integrator)SI (System Integrator) 3rd Party LCM"/>
                     </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-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."/>
@@ -11745,9 +13728,197 @@
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="nameProps" value="contact-name,vendor-type"/>
                 <xml-property name="uriTemplate" value="/common/contacts/contact/{contact-name}"/>
-            <xml-property name="requiredProps" value="contact-name"/>
+                <xml-property name="requiredProps" value="contact-name"/>
+				<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"/>
+            </xml-properties>
+            <xml-root-element name="object-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="objectGroup" name="object-group" type="inventory.aai.onap.org.v22.ObjectGroup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ObjectGroup">
+            <xml-root-element name="object-group"/>
+            <java-attributes>
+            	<xml-element java-attribute="objectGroupId" name="object-group-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="groupType" name="group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of object contained in the list."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupName" name="group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the list."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupName2" name="group-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alias name for object-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="version" name="version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="used to track the versions of the object"/>
+                    </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-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 container-type="java.util.ArrayList" java-attribute="communityList" name="community-list" type="inventory.aai.onap.org.v22.CommunityList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v22.IpAddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v22.PortList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v22.SelectorList"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
+            </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="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>
+                <xml-element java-attribute="communityValue" name="community-value" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="String value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String 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-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.v22.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Community List"/>
+                <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-properties>
+        </java-type>
+        
+        <java-type name="IpAddressList">
+            <xml-root-element name="ip-address-list"/>
+            <java-attributes>
+                <xml-element java-attribute="ipAddress" name="ip-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAddressEnd" name="ip-address-end" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address end range"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version, either 4 or 6"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="reserved, static, dhcp"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="assignment" name="assignment" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value=""/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operator" name="operator" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operator to apply to the port (greater than, less than, etc)."/>
+                    </xml-properties>
+                </xml-element>
+				<xml-element java-attribute="length" name="length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="ip-address prefix length, 32 for single address."/>
+                    </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-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.v22.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IP Address Range"/>
+                <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-properties>
+        </java-type>        
 
         <java-type name="PortList">
             <xml-root-element name="port-list"/>
@@ -11772,6 +13943,21 @@
                         <xml-property name="description" value="Operator to apply to the port (greater than, less than, etc)."/>
                     </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-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."/>
@@ -11784,6 +13970,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-properties>
         </java-type>
 
@@ -11805,6 +13992,21 @@
                         <xml-property name="description" value="Type or usage of the selector"/>
                     </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-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."/>
@@ -11817,6 +14019,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-properties>
         </java-type>
 
@@ -11916,18 +14119,39 @@
                         <xml-property name="description" value="Set of rule variables"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="policyVariableName" name="policy-variable-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Policy Variable Name"/>
+                    </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-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="rules" name="rules" type="inventory.aai.onap.org.v22.Rules"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v22.IpAddressList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v22.SelectorList"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Definition of policy"/>
-                <xml-property name="indexedProps" value="policy-id"/>
+                <xml-property name="indexedProps" value="policy-id,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"/>
@@ -12021,11 +14245,27 @@
                         <xml-property name="description" value="Description."/>
                     </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-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 container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v22.IpAddressList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v22.PortList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v22.SelectorList"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v22.RelationshipList"/>
@@ -12036,6 +14276,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-properties>
         </java-type>
 
@@ -12079,6 +14320,21 @@
                         <xml-property name="description" value="Boolean to represent if requires internet access."/>
                     </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-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."/>
@@ -12088,7 +14344,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes an vlan characteristic"/>
-                <xml-property name="indexedProps" value="vlan-characteristic-id"/>
+                <xml-property name="indexedProps" value="vlan-characteristic-id,data-owner,data-source,data-source-version"/>
                 <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}"/>
@@ -12129,6 +14385,21 @@
                         <xml-property name="description" value="Node the related object applies to"/>
                     </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-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."/>
@@ -12139,7 +14410,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes an relationship rule"/>
-                <xml-property name="indexedProps" value="rule-id,context,rule-traversals,applies-to"/>
+                <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"/>
@@ -12181,6 +14452,21 @@
                         <xml-property name="description" value="Order in traversal"/>
                     </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-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."/>
@@ -12190,7 +14476,7 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes an relationship component"/>
-                <xml-property name="indexedProps" value="rule-node,rule-property,rule-value,component-order"/>
+                <xml-property name="indexedProps" value="rule-node,rule-property,rule-value,component-order,data-owner,data-source,data-source-version"/>
                 <xml-property name="container" value="relationship-components"/>
                 <xml-property name="dependentOn" value="relationship-rule"/>
                 <xml-property name="uriTemplate" value="common/relationship-components/relationship-component/{rule-node}"/>
@@ -12217,21 +14503,51 @@
                         <xml-property name="description" value="Route UUID."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+                <xml-element java-attribute="networkStartAddress" name="network-start-address" required="true" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Name of the forwarding-path"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+                <xml-element java-attribute="cidrMask" name="cidr-mask" required="true" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="CIDR-mask for aggregate route subnet"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                <xml-element java-attribute="ipVersion" name="ip-version" required="true" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies is aggregate route is ipv4 or ipv6"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="networkAddress" name="network-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network Address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHop" name="next-hop" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Next Hop"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routePath" name="route-path" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Path"/>
+                    </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-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."/>
@@ -12241,11 +14557,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="uniqueProps" value="agg-route-id"/>
+                <xml-property name="indexedProps" value="agg-route-id,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,network-start-address,cidr-mask,ip-version"/>            
             </xml-properties>
 		</java-type>
 		<java-type name="CommunicationServiceProfiles">
-- 
cgit 1.2.3-korg